13100: Handle writable collections mounted below output dir.

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

diff --git a/services/ws/main.go b/services/ws/main.go
index 30d569c98890264aa4a1028085d94764e01a7da4..a0006a4f8a8e0e70e7488f6ce4dee4ac4359984c 100644 (file)
--- a/services/ws/main.go
+++ b/services/ws/main.go
@@ -7,14 +7,13 @@ package main
 import (
        "flag"
        "fmt"
-       "os"
 
        "git.curoverse.com/arvados.git/sdk/go/config"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
-       arvadosVersion "git.curoverse.com/arvados.git/sdk/go/version"
 )
 
 var logger = ctxlog.FromContext
+var version = "dev"
 
 func main() {
        log := logger(nil)
@@ -27,8 +26,8 @@ func main() {
 
        // Print version information if requested
        if *getVersion {
-               fmt.Printf("Version: %s\n", arvadosVersion.GetVersion())
-               os.Exit(0)
+               fmt.Printf("arvados-ws %s\n", version)
+               return
        }
 
        err := config.LoadFile(&cfg, *configPath)
@@ -48,9 +47,7 @@ func main() {
                return
        }
 
-       log.Printf("arvados-ws %q started", arvadosVersion.GetVersion())
-
-       log.Info("started")
+       log.Printf("arvados-ws %s started", version)
        srv := &server{wsConfig: &cfg}
        log.Fatal(srv.Run())
 }