X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7ae5533a074d80882171b33f7b659c9bcace1bd3..0a2adc4256358d620fb063489aafbaba8de62b84:/services/ws/main.go?ds=sidebyside

diff --git a/services/ws/main.go b/services/ws/main.go
index 719128f3f9..a0006a4f8a 100644
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -1,28 +1,42 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"flag"
 	"fmt"
-	"log"
-	"net/http"
-	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/config"
+	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
 )
 
+var logger = ctxlog.FromContext
+var version = "dev"
+
 func main() {
+	log := logger(nil)
+
 	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()
+	getVersion := flag.Bool("version", false, "Print version information and exit.")
+	cfg := defaultConfig()
 	flag.Parse()
 
+	// Print version information if requested
+	if *getVersion {
+		fmt.Printf("arvados-ws %s\n", version)
+		return
+	}
+
 	err := config.LoadFile(&cfg, *configPath)
 	if err != nil {
 		log.Fatal(err)
 	}
-	if !cfg.Debug {
-		debugLogf = func(string, ...interface{}) {}
-	}
+
+	ctxlog.SetLevel(cfg.LogLevel)
+	ctxlog.SetFormat(cfg.LogFormat)
 
 	if *dumpConfig {
 		txt, err := config.Dump(&cfg)
@@ -33,22 +47,7 @@ func main() {
 		return
 	}
 
-	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,
-		},
-	}
-	eventSource.NewSink().Stop()
-
-	log.Printf("listening at %s", srv.Addr)
-	log.Fatal(srv.ListenAndServe())
+	log.Printf("arvados-ws %s started", version)
+	srv := &server{wsConfig: &cfg}
+	log.Fatal(srv.Run())
 }