14324: Use logrus in Azure driver. Fix Sirupsen->sirupsen in imports

[arvados.git] / services / keep-web / main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 938377b5256e4b5dfad6ba6f333e527b5dd10873..fd63535691318368b880d320fee9f74b51d7762a 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -7,12 +7,12 @@ package main
 import (
        "flag"
        "fmt"
-       "log"
        "os"
        "time"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/config"
+       log "github.com/sirupsen/logrus"
        "github.com/coreos/go-systemd/daemon"
 )
 
@@ -65,6 +65,10 @@ func init() {
        if os.Getenv("ARVADOS_API_TOKEN") == "" {
                os.Setenv("ARVADOS_API_TOKEN", "xxx")
        }
+
+       log.SetFormatter(&log.JSONFormatter{
+               TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
+       })
 }
 
 func main() {
@@ -94,8 +98,8 @@ func main() {
 
        // Print version information if requested
        if *getVersion {
-               fmt.Printf("Version: %s\n", version)
-               os.Exit(0)
+               fmt.Printf("keep-web %s\n", version)
+               return
        }
 
        if err := config.LoadFile(cfg, configPath); err != nil {
@@ -115,7 +119,7 @@ func main() {
                log.Fatal(config.DumpAndExit(cfg))
        }
 
-       log.Printf("keep-web %q started", version)
+       log.Printf("keep-web %s started", version)
 
        os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
        srv := &server{Config: cfg}