Merge branch '5824-keep-web' refs #5824

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

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index d780cc38b74029acc18c19ab0f0ea96a266829a6..135f01b394720efba18dc8082744637bfaf3a7c1 100644 (file)
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -12,11 +12,16 @@ func init() {
        // different token before doing anything with the client). We
        // set this dummy value during init so it doesn't clobber the
        // one used by "run test servers".
-       os.Setenv("ARVADOS_API_TOKEN", "xxx")
+       if os.Getenv("ARVADOS_API_TOKEN") == "" {
+               os.Setenv("ARVADOS_API_TOKEN", "xxx")
+       }
 }
 
 func main() {
        flag.Parse()
+       if os.Getenv("ARVADOS_API_HOST") == "" {
+               log.Fatal("ARVADOS_API_HOST environment variable must be set.")
+       }
        srv := &server{}
        if err := srv.Start(); err != nil {
                log.Fatal(err)