X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c656c55fe63a22b075223fe7f295e7e21e18b8c..685db28b50225cde7dbb03aa2275f7a165d888a3:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 0f2cf1237d..a9ac834a20 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -7,12 +7,14 @@ package main
 import (
 	"flag"
 	"fmt"
+	"mime"
 	"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/ghodss/yaml"
+	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -27,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
@@ -36,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
 }
 
@@ -78,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)
@@ -104,9 +108,13 @@ func main() {
 
 	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}
-	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 {