projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18339: Move trash-sweep from background thread to controller action.
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index e4028842f0c6b9390715a93c836846f2d9ba753b..a9ac834a20cedf21f80fcc5e9a7742f86bb0e812 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"
)
@@
-28,7
+29,7
@@
type Config struct {
cluster *arvados.Cluster
}
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
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.cluster = cls
cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
+ cfg.Cache.cluster = cls
+ cfg.Cache.logger = logger
return &cfg
}
return &cfg
}
@@
-79,7
+82,7
@@
func configure(logger log.FieldLogger, args []string) *Config {
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)
}
- cfg := newConfig(arvCfg)
+ cfg := newConfig(
logger,
arvCfg)
if *dumpConfig {
out, err := yaml.Marshal(cfg)
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}
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 {