projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15003: Merge branch 'master'
[arvados.git]
/
lib
/
service
/
cmd.go
diff --git
a/lib/service/cmd.go
b/lib/service/cmd.go
index cfc40778fefe43d565bb0658b626e899edfc1f09..fdcf3b4ac5670992bf94c1d11e886fab5605e84d 100644
(file)
--- a/
lib/service/cmd.go
+++ b/
lib/service/cmd.go
@@
-10,6
+10,7
@@
import (
"flag"
"fmt"
"io"
"flag"
"fmt"
"io"
+ "io/ioutil"
"log"
"net"
"net/http"
"log"
"net"
"net/http"
@@
-72,7
+73,10
@@
func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
} else if err != nil {
return 2
}
} 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
}
if err != nil {
return 1
}