projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17960-arv-copy-projects-doc' into main refs #17960
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index e4028842f0c6b9390715a93c836846f2d9ba753b..a62e0abb667ca5211994211e9f401c271e2e5b5b 100644
(file)
--- 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"
"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"
)
log "github.com/sirupsen/logrus"
)
@@
-37,6
+38,7
@@
func newConfig(arvCfg *arvados.Config) *Config {
}
cfg.cluster = cls
cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
}
cfg.cluster = cls
cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
+ cfg.Cache.cluster = cls
return &cfg
}
return &cfg
}
@@
-111,7
+113,7
@@
func main() {
os.Setenv("ARVADOS_API_HOST", cfg.cluster.Services.Controller.ExternalURL.Host)
srv := &server{Config: cfg}
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 {
log.Fatal(err)
}
if _, err := daemon.SdNotify(false, "READY=1"); err != nil {