package main
import (
+ "context"
"flag"
"fmt"
"mime"
"os"
+ "git.arvados.org/arvados.git/lib/cmd"
"git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
"github.com/coreos/go-systemd/daemon"
"github.com/ghodss/yaml"
"github.com/sirupsen/logrus"
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.cluster = cls
cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache
+ cfg.Cache.cluster = cls
+ cfg.Cache.logger = logger
return &cfg
}
})
}
-func configure(logger log.FieldLogger, args []string) *Config {
- flags := flag.NewFlagSet(args[0], flag.ExitOnError)
+func configure(logger log.FieldLogger, args []string) (*Config, error) {
+ flags := flag.NewFlagSet(args[0], flag.ContinueOnError)
loader := config.NewLoader(os.Stdin, logger)
loader.SetupFlags(flags)
getVersion := flags.Bool("version", false,
"print version information and exit.")
+ prog := args[0]
args = loader.MungeLegacyConfigArgs(logger, args[1:], "-legacy-keepweb-config")
- flags.Parse(args)
-
- // Print version information if requested
- if *getVersion {
- fmt.Printf("keep-web %s\n", version)
- return nil
+ if ok, code := cmd.ParseFlags(flags, prog, args, "", os.Stderr); !ok {
+ os.Exit(code)
+ } else if *getVersion {
+ fmt.Printf("%s %s\n", args[0], version)
+ return nil, nil
}
arvCfg, err := loader.Load()
if err != nil {
- log.Fatal(err)
+ return nil, err
}
- cfg := newConfig(arvCfg)
+ cfg := newConfig(logger, arvCfg)
if *dumpConfig {
out, err := yaml.Marshal(cfg)
if err != nil {
- log.Fatal(err)
+ return nil, err
}
_, err = os.Stdout.Write(out)
- if err != nil {
- log.Fatal(err)
- }
- return nil
+ return nil, err
}
- return cfg
+ return cfg, nil
}
func main() {
- logger := log.New()
-
- cfg := configure(logger, os.Args)
- if cfg == nil {
+ initLogger := log.StandardLogger()
+ logger := initLogger.WithField("PID", os.Getpid())
+ cfg, err := configure(logger, os.Args)
+ if err != nil {
+ log.Fatal(err)
+ } else if cfg == nil {
return
}
-
- log.Printf("keep-web %s started", version)
+ logger = logger.WithField("ClusterID", cfg.cluster.ClusterID)
+ logger.Printf("keep-web %s started", version)
+ ctx := ctxlog.Context(context.Background(), logger)
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(logrus.StandardLogger()); err != nil {
- log.Fatal(err)
+ if err := srv.Start(ctx, initLogger); err != nil {
+ logger.Fatal(err)
}
if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
- log.Printf("Error notifying init daemon: %v", err)
+ logger.Printf("Error notifying init daemon: %v", err)
}
- log.Println("Listening at", srv.Addr)
+ logger.Println("Listening at", srv.Addr)
if err := srv.Wait(); err != nil {
- log.Fatal(err)
+ logger.Fatal(err)
}
}