X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d63601c63f651ab9fe4fefb5a7e8d76bf0495da3..066f9bcf5a74c255cb64cf89e554cf64ec719f5a:/services/ws/main.go

diff --git a/services/ws/main.go b/services/ws/main.go
index c4e1078586..7c3625bdad 100644
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -7,15 +7,18 @@ import (
 	"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)
@@ -23,7 +26,8 @@ func main() {
 		log.Fatal(err)
 	}
 
-	loggerConfig(cfg)
+	ctxlog.SetLevel(cfg.LogLevel)
+	ctxlog.SetFormat(cfg.LogFormat)
 
 	if *dumpConfig {
 		txt, err := config.Dump(&cfg)
@@ -34,6 +38,7 @@ func main() {
 		return
 	}
 
+	log.Info("started")
 	eventSource := &pgEventSource{
 		DataSource: cfg.Postgres.ConnectionString(),
 		QueueSize:  cfg.ServerEventQueue,
@@ -46,7 +51,7 @@ func main() {
 		Handler: &router{
 			Config:         &cfg,
 			eventSource:    eventSource,
-			newPermChecker: func() permChecker { return NewPermChecker(cfg.Client) },
+			newPermChecker: func() permChecker { return newPermChecker(cfg.Client) },
 		},
 	}
 	// Bootstrap the eventSource by attaching a dummy subscriber