projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17944-backend-vocabulary-validation-rebased' into main.
[arvados.git]
/
services
/
keep-web
/
main.go
diff --git
a/services/keep-web/main.go
b/services/keep-web/main.go
index 9dae50a8a56b3dbc20ef3fa6709499a197d41b64..a9ac834a20cedf21f80fcc5e9a7742f86bb0e812 100644
(file)
--- a/
services/keep-web/main.go
+++ b/
services/keep-web/main.go
@@
-7,13
+7,15
@@
package main
import (
"flag"
"fmt"
import (
"flag"
"fmt"
+ "mime"
"os"
"os"
- "git.
curoverse.com
/arvados.git/lib/config"
- "git.
curoverse.com
/arvados.git/sdk/go/arvados"
+ "git.
arvados.org
/arvados.git/lib/config"
+ "git.
arvados.org
/arvados.git/sdk/go/arvados"
"github.com/coreos/go-systemd/daemon"
"github.com/coreos/go-systemd/daemon"
+ "github.com/ghodss/yaml"
+ "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
- yaml "gopkg.in/yaml.v2"
)
var (
)
var (
@@
-27,8
+29,7
@@
type Config struct {
cluster *arvados.Cluster
}
cluster *arvados.Cluster
}
-// DefaultConfig returns the default configuration.
-func DefaultConfig(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 DefaultConfig(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 :=
DefaultConfig(
arvCfg)
+ cfg :=
newConfig(logger,
arvCfg)
if *dumpConfig {
out, err := yaml.Marshal(cfg)
if *dumpConfig {
out, err := yaml.Marshal(cfg)
@@
-105,9
+108,13
@@
func main() {
log.Printf("keep-web %s started", version)
log.Printf("keep-web %s started", version)
+ if ext := ".txt"; mime.TypeByExtension(ext) == "" {
+ log.Warnf("cannot look up MIME type for %q -- this probably means /etc/mime.types is missing -- clients will see incorrect content types", ext)
+ }
+
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 {