X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5a420beeb6c64efc3ca0ef13d4ab9ac6c654c3ab..0e2a467a923bd490f3e1dc4d8c00a9e2f29e59d4:/services/ws/main.go

diff --git a/services/ws/main.go b/services/ws/main.go
index a143ae935b..de8e6328db 100644
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -1,56 +1,77 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"flag"
 	"fmt"
-	"log"
-	"net/http"
-	"time"
+	"os"
 
-	"git.curoverse.com/arvados.git/sdk/go/config"
+	"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"
 )
 
-var debugLogf = func(string, ...interface{}) {}
+var logger = ctxlog.FromContext
+var version = "dev"
 
-func main() {
-	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.")
+
+	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
+	}
 
-	err := config.LoadFile(&cfg, *configPath)
+	cfg, err := loader.Load()
 	if err != nil {
 		log.Fatal(err)
 	}
-	if cfg.Debug {
-		debugLogf = log.Printf
+
+	cluster, err := cfg.GetCluster("")
+	if err != nil {
+		log.Fatal(err)
 	}
 
+	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.Printf("listening at %s", srv.Addr)
-	log.Fatal(srv.ListenAndServe())
+	log.Printf("arvados-ws %s started", version)
+	srv := &server{cluster: cluster}
+	log.Fatal(srv.Run())
 }