8460: Move logging setup to log.go, use fixed-width timestamps.

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

diff --git a/services/ws/main.go b/services/ws/main.go
index 33728dcae0510f889dc661847799edcd99f62847..0031dc0062a8d4c8462906bbff37c8f22314463b 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -7,7 +7,6 @@ import (
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/config"
-       "github.com/Sirupsen/logrus"
 )
 
 func main() {
@@ -23,24 +22,7 @@ func main() {
                log.Fatal(err)
        }
 
-       lvl, err := logrus.ParseLevel(cfg.LogLevel)
-       if err != nil {
-               log.Fatal(err)
-       }
-       rootLogger.Level = lvl
-       switch cfg.LogFormat {
-       case "text":
-               rootLogger.Formatter = &logrus.TextFormatter{
-                       FullTimestamp:   true,
-                       TimestampFormat: time.RFC3339Nano,
-               }
-       case "json":
-               rootLogger.Formatter = &logrus.JSONFormatter{
-                       TimestampFormat: time.RFC3339Nano,
-               }
-       default:
-               log.WithField("LogFormat", cfg.LogFormat).Fatal("unknown log format")
-       }
+       loggerConfig(cfg)
 
        if *dumpConfig {
                txt, err := config.Dump(&cfg)