X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0a415b6c80c3bf39bb753274aae857eadde2f590..685db28b50225cde7dbb03aa2275f7a165d888a3:/services/keep-web/main.go diff --git a/services/keep-web/main.go b/services/keep-web/main.go index e4028842f0..a9ac834a20 100644 --- a/services/keep-web/main.go +++ b/services/keep-web/main.go @@ -14,6 +14,7 @@ import ( "git.arvados.org/arvados.git/sdk/go/arvados" "github.com/coreos/go-systemd/daemon" "github.com/ghodss/yaml" + "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" ) @@ -28,7 +29,7 @@ type Config struct { cluster *arvados.Cluster } -func newConfig(arvCfg *arvados.Config) *Config { +func newConfig(logger logrus.FieldLogger, arvCfg *arvados.Config) *Config { cfg := Config{} var cls *arvados.Cluster var err error @@ -37,6 +38,8 @@ func newConfig(arvCfg *arvados.Config) *Config { } cfg.cluster = cls cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache + cfg.Cache.cluster = cls + cfg.Cache.logger = logger return &cfg } @@ -79,7 +82,7 @@ func configure(logger log.FieldLogger, args []string) *Config { if err != nil { log.Fatal(err) } - cfg := newConfig(arvCfg) + cfg := newConfig(logger, arvCfg) if *dumpConfig { out, err := yaml.Marshal(cfg) @@ -111,7 +114,7 @@ func main() { os.Setenv("ARVADOS_API_HOST", cfg.cluster.Services.Controller.ExternalURL.Host) srv := &server{Config: cfg} - if err := srv.Start(); err != nil { + if err := srv.Start(logrus.StandardLogger()); err != nil { log.Fatal(err) } if _, err := daemon.SdNotify(false, "READY=1"); err != nil {