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 647eab1653294311644bdce91faa367bd0ec1832..a9ac834a20cedf21f80fcc5e9a7742f86bb0e812 100644
(file)
--- a/
services/keep-web/main.go
+++ b/
services/keep-web/main.go
@@
-29,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
@@
-38,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
}
@@
-80,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)