X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ca06cfbda0e84d469f7810a280cfa4dfa8997260..4a2dc82a1acce855151928abe0030e1dd7dbf728:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 8bd890322e..d09fce706c 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -7,18 +7,18 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"os"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/config"
-	arvadosVersion "git.curoverse.com/arvados.git/sdk/go/version"
+	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
 )
 
 var (
 	defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
+	version           = "dev"
 )
 
 // Config specifies server configuration.
@@ -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", arvadosVersion.GetVersion())
-		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", arvadosVersion.GetVersion())
+	log.Printf("keep-web %s started", version)
 
 	os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
 	srv := &server{Config: cfg}