Merge branch '15467-config-fixups'

[arvados.git] / services / ws / main.go

diff --git a/services/ws/main.go b/services/ws/main.go
index 16fe87f1ccf753633316ad3d9be6e69da730e78f..de8e6328dbaadb0ba5568a229f6e62193ecd28cb 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -1,72 +1,77 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
        "flag"
        "fmt"
-       "net/http"
-       "time"
+       "os"
 
-       "git.curoverse.com/arvados.git/sdk/go/config"
-       "github.com/Sirupsen/logrus"
+       "git.curoverse.com/arvados.git/lib/config"
+       "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
+       "github.com/ghodss/yaml"
+       "github.com/sirupsen/logrus"
 )
 
-func main() {
-       log := logger(nil)
+var logger = ctxlog.FromContext
+var version = "dev"
 
-       configPath := flag.String("config", "/etc/arvados/ws/ws.yml", "`path` to config file")
-       dumpConfig := flag.Bool("dump-config", false, "show current configuration and exit")
-       cfg := DefaultConfig()
-       flag.Parse()
+func configure(log logrus.FieldLogger, args []string) *arvados.Cluster {
+       flags := flag.NewFlagSet(args[0], flag.ExitOnError)
+       dumpConfig := flags.Bool("dump-config", false, "show current configuration and exit")
+       getVersion := flags.Bool("version", false, "Print version information and exit.")
 
-       err := config.LoadFile(&cfg, *configPath)
+       loader := config.NewLoader(nil, log)
+       loader.SetupFlags(flags)
+       args = loader.MungeLegacyConfigArgs(log, args[1:], "-legacy-ws-config")
+
+       flags.Parse(args)
+
+       // Print version information if requested
+       if *getVersion {
+               fmt.Printf("arvados-ws %s\n", version)
+               return nil
+       }
+
+       cfg, err := loader.Load()
        if err != nil {
                log.Fatal(err)
        }
 
-       lvl, err := logrus.ParseLevel(cfg.LogLevel)
+       cluster, err := cfg.GetCluster("")
        if err != nil {
                log.Fatal(err)
        }
-       rootLogger.Level = lvl
-       switch cfg.LogFormat {
-       case "text":
-               rootLogger.Formatter = &logrus.TextFormatter{
-                       FullTimestamp:   true,
-                       TimestampFormat: time.RFC3339Nano,
-               }
-       case "json":
-               rootLogger.Formatter = &logrus.JSONFormatter{
-                       TimestampFormat: time.RFC3339Nano,
-               }
-       default:
-               log.WithField("LogFormat", cfg.LogFormat).Fatal("unknown log format")
-       }
+
+       ctxlog.SetLevel(cluster.SystemLogs.LogLevel)
+       ctxlog.SetFormat(cluster.SystemLogs.Format)
 
        if *dumpConfig {
-               txt, err := config.Dump(&cfg)
+               out, err := yaml.Marshal(cfg)
                if err != nil {
                        log.Fatal(err)
                }
-               fmt.Print(string(txt))
-               return
+               _, err = os.Stdout.Write(out)
+               if err != nil {
+                       log.Fatal(err)
+               }
+               return nil
        }
+       return cluster
+}
 
-       eventSource := &pgEventSource{
-               DataSource: cfg.Postgres.ConnectionString(),
-               QueueSize:  cfg.ServerEventQueue,
-       }
-       srv := &http.Server{
-               Addr:           cfg.Listen,
-               ReadTimeout:    time.Minute,
-               WriteTimeout:   time.Minute,
-               MaxHeaderBytes: 1 << 20,
-               Handler: &router{
-                       Config:      &cfg,
-                       eventSource: eventSource,
-               },
+func main() {
+       log := logger(nil)
+
+       cluster := configure(log, os.Args)
+       if cluster == nil {
+               return
        }
-       eventSource.NewSink().Stop()
 
-       log.WithField("Listen", srv.Addr).Info("listening")
-       log.Fatal(srv.ListenAndServe())
+       log.Printf("arvados-ws %s started", version)
+       srv := &server{cluster: cluster}
+       log.Fatal(srv.Run())
 }