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 a143ae935be1b7aceeaadc54ea69091482d308dd..9eee8130af9d9b4b8fe831aa48865f5abd64808f 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -3,28 +3,31 @@ 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 debugLogf = func(string, ...interface{}) {}
+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)
        if err != nil {
                log.Fatal(err)
        }
-       if cfg.Debug {
-               debugLogf = log.Printf
-       }
+
+       ctxlog.SetLevel(cfg.LogLevel)
+       ctxlog.SetFormat(cfg.LogFormat)
 
        if *dumpConfig {
                txt, err := config.Dump(&cfg)
@@ -35,6 +38,7 @@ func main() {
                return
        }
 
+       log.Info("started")
        eventSource := &pgEventSource{
                DataSource: cfg.Postgres.ConnectionString(),
                QueueSize:  cfg.ServerEventQueue,
@@ -45,12 +49,21 @@ func main() {
                WriteTimeout:   time.Minute,
                MaxHeaderBytes: 1 << 20,
                Handler: &router{
-                       Config:      &cfg,
-                       eventSource: eventSource,
+                       Config:         &cfg,
+                       eventSource:    eventSource,
+                       newPermChecker: func() permChecker { return newPermChecker(cfg.Client) },
                },
        }
-       eventSource.NewSink().Stop()
 
-       log.Printf("listening at %s", srv.Addr)
+       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())
 }