[ARVADOS] created: 1.3.0-935-g311d552b3

[Git user]

        at  311d552b31fbb97d10cdba7e248279d197751f79 (commit)


commit 311d552b31fbb97d10cdba7e248279d197751f79
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu May 23 09:31:40 2019 -0400

    15003: Temporarily disable config warnings.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 4b7341d72..955b21f9e 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -10,6 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -70,7 +71,10 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
 	} else if err != nil {
 		return 2
 	}
-	cfg, err := config.LoadFile(*configFile, log)
+	// Logged warnings are discarded for now: the config template
+	// is incomplete, which causes extra warnings about keys that
+	// are really OK.
+	cfg, err := config.LoadFile(*configFile, ctxlog.New(ioutil.Discard, "json", "error"))
 	if err != nil {
 		return 1
 	}

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


hooks/post-receive
--