[ARVADOS] created: 1.1.4-47-gd2c0793

[Git user]

        at  d2c0793e523daf391b492eb22d23ed4b895d7790 (commit)


commit d2c0793e523daf391b492eb22d23ed4b895d7790
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Apr 19 15:01:11 2018 -0400

    13371: Don't error out on "no config file" when using -dump-config.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 724af27..24da4fe 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -102,6 +102,8 @@ func main() {
 		if h := os.Getenv("ARVADOS_API_HOST"); h != "" && configPath == defaultConfigPath {
 			log.Printf("DEPRECATED: Using ARVADOS_API_HOST environment variable. Use config file instead.")
 			cfg.Client.APIHost = h
+		} else if *dumpConfig {
+			log.Printf("WARNING: Ignoring error reading config file: %s", err)
 		} else {
 			log.Fatal(err)
 		}

-----------------------------------------------------------------------


hooks/post-receive
--