X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e67d0f5d43c56f78694ea4a5f93acec5c93cd0fb..89cab1faedd4c4209ac642ffd442b0085d9da593:/services/keep-web/main.go diff --git a/services/keep-web/main.go b/services/keep-web/main.go index 27ceb48c78..208b23b93b 100644 --- a/services/keep-web/main.go +++ b/services/keep-web/main.go @@ -5,53 +5,45 @@ package main import ( + "context" "flag" - "log" + "fmt" + "mime" "os" - "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/config" + "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" + log "github.com/sirupsen/logrus" ) var ( - defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml" + version = "dev" ) // Config specifies server configuration. type Config struct { - Client arvados.Client - - Listen string - - AnonymousTokens []string - AttachmentOnlyHost string - TrustAllContent bool - - Cache cache - - // Hack to support old command line flag, which is a bool - // meaning "get actual token from environment". - deprecatedAllowAnonymous bool - - //Authorization token to be included in all health check requests. - ManagementToken string + Client arvados.Client + Cache cache + cluster *arvados.Cluster } -// DefaultConfig returns the default configuration. -func DefaultConfig() *Config { - return &Config{ - Listen: ":80", - Cache: cache{ - TTL: arvados.Duration(5 * time.Minute), - UUIDTTL: arvados.Duration(5 * time.Second), - MaxCollectionEntries: 1000, - MaxCollectionBytes: 100000000, - MaxPermissionEntries: 1000, - MaxUUIDEntries: 1000, - }, +func newConfig(logger logrus.FieldLogger, arvCfg *arvados.Config) *Config { + cfg := Config{} + var cls *arvados.Cluster + var err error + if cls, err = arvCfg.GetCluster(""); err != nil { + log.Fatal(err) } + cfg.cluster = cls + cfg.Cache.config = &cfg.cluster.Collections.WebDAVCache + cfg.Cache.cluster = cls + cfg.Cache.logger = logger + return &cfg } func init() { @@ -63,58 +55,76 @@ func init() { if os.Getenv("ARVADOS_API_TOKEN") == "" { os.Setenv("ARVADOS_API_TOKEN", "xxx") } + + log.SetFormatter(&log.JSONFormatter{ + TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00", + }) } -func main() { - cfg := DefaultConfig() - - var configPath string - deprecated := " (DEPRECATED -- use config file instead)" - flag.StringVar(&configPath, "config", defaultConfigPath, - "`path` to JSON or YAML configuration file") - flag.StringVar(&cfg.Listen, "listen", "", - "address:port or :port to listen on"+deprecated) - flag.BoolVar(&cfg.deprecatedAllowAnonymous, "allow-anonymous", false, - "Load an anonymous token from the ARVADOS_API_TOKEN environment variable"+deprecated) - flag.StringVar(&cfg.AttachmentOnlyHost, "attachment-only-host", "", - "Only serve attachments at the given `host:port`"+deprecated) - flag.BoolVar(&cfg.TrustAllContent, "trust-all-content", false, - "Serve non-public content from a single origin. Dangerous: read docs before using!"+deprecated) - flag.StringVar(&cfg.ManagementToken, "management-token", "", - "Authorization token to be included in all health check requests.") - - dumpConfig := flag.Bool("dump-config", false, +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) + + dumpConfig := flags.Bool("dump-config", false, "write current configuration to stdout and exit") - flag.Usage = usage - flag.Parse() - - if err := config.LoadFile(cfg, configPath); err != nil { - if h := os.Getenv("ARVADOS_API_HOST"); h != "" && configPath == defaultConfigPath { - log.Printf("DEPRECATED: Using ARVADOS_API_HOST environment variable. Use config file instead.") - cfg.Client.APIHost = h - } else { - log.Fatal(err) - } + getVersion := flags.Bool("version", false, + "print version information and exit.") + + prog := args[0] + args = loader.MungeLegacyConfigArgs(logger, args[1:], "-legacy-keepweb-config") + 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 } - if cfg.deprecatedAllowAnonymous { - log.Printf("DEPRECATED: Using -allow-anonymous command line flag with ARVADOS_API_TOKEN environment variable. Use config file instead.") - cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")} + + arvCfg, err := loader.Load() + if err != nil { + return nil, err } + cfg := newConfig(logger, arvCfg) if *dumpConfig { - log.Fatal(config.DumpAndExit(cfg)) + out, err := yaml.Marshal(cfg) + if err != nil { + return nil, err + } + _, err = os.Stdout.Write(out) + return nil, err } + return cfg, nil +} - os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost) - srv := &server{Config: cfg} - if err := srv.Start(); err != nil { +func main() { + 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 + } + 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(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) } }