Merge branch '8784-dir-listings'

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

diff --git a/services/ws/main.go b/services/ws/main.go
index c83f8d956a814e77c3255b13ba26ce4078df2f89..db33cbfd004173ff787f9767eddd06a448744d63 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -1,19 +1,25 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
        "flag"
        "fmt"
-       "net/http"
-       "time"
 
        "git.curoverse.com/arvados.git/sdk/go/config"
-       log "github.com/Sirupsen/logrus"
+       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
 )
 
+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,24 +27,8 @@ func main() {
                log.Fatal(err)
        }
 
-       lvl, err := log.ParseLevel(cfg.LogLevel)
-       if err != nil {
-               log.Fatal(err)
-       }
-       log.SetLevel(lvl)
-       switch cfg.LogFormat {
-       case "text":
-               log.SetFormatter(&log.TextFormatter{
-                       FullTimestamp:   true,
-                       TimestampFormat: time.RFC3339Nano,
-               })
-       case "json":
-               log.SetFormatter(&log.JSONFormatter{
-                       TimestampFormat: time.RFC3339Nano,
-               })
-       default:
-               log.WithField("LogFormat", cfg.LogFormat).Fatal("unknown log format")
-       }
+       ctxlog.SetLevel(cfg.LogLevel)
+       ctxlog.SetFormat(cfg.LogFormat)
 
        if *dumpConfig {
                txt, err := config.Dump(&cfg)
@@ -49,22 +39,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.WithField("Listen", srv.Addr).Info("listening")
-       log.Fatal(srv.ListenAndServe())
+       log.Info("started")
+       srv := &server{wsConfig: &cfg}
+       log.Fatal(srv.Run())
 }