Merge branch '10846-nodemanager-errors' closes #10846

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

diff --git a/services/ws/main.go b/services/ws/main.go
index 9a24b312b05344c07a4331b7652199a379f82869..9eee8130af9d9b4b8fe831aa48865f5abd64808f 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -3,17 +3,22 @@ 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"
+       "github.com/coreos/go-systemd/daemon"
 )
 
+var logger = ctxlog.FromContext
+
 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()
+       cfg := defaultConfig()
        flag.Parse()
 
        err := config.LoadFile(&cfg, *configPath)
@@ -21,6 +26,9 @@ func main() {
                log.Fatal(err)
        }
 
+       ctxlog.SetLevel(cfg.LogLevel)
+       ctxlog.SetFormat(cfg.LogFormat)
+
        if *dumpConfig {
                txt, err := config.Dump(&cfg)
                if err != nil {
@@ -30,17 +38,32 @@ func main() {
                return
        }
 
+       log.Info("started")
+       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{
-                       EventSource: (&pgEventSource{
-                               PgConfig:  cfg.Postgres,
-                               QueueSize: cfg.ServerEventQueue,
-                       }).EventSource(),
+                       Config:         &cfg,
+                       eventSource:    eventSource,
+                       newPermChecker: func() permChecker { return newPermChecker(cfg.Client) },
                },
        }
+
+       go func() {
+               eventSource.Run()
+               log.Fatal("event source stopped")
+       }()
+
+       if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+               log.WithError(err).Warn("error notifying init daemon")
+       }
+
+       log.WithField("Listen", srv.Addr).Info("listening")
        log.Fatal(srv.ListenAndServe())
 }