diff --git a/etcd/server.go b/etcd/server.go index 42b69461..7a0c336c 100644 --- a/etcd/server.go +++ b/etcd/server.go @@ -145,6 +145,9 @@ func (obj *EmbdEtcd) runServer(newCluster bool, peerURLsMap etcdtypes.URLsMap) ( cfg.ACUrls = aCUrls cfg.StrictReconfigCheck = false // XXX: workaround https://github.com/etcd-io/etcd/issues/6305 cfg.MaxTxnOps = DefaultMaxTxnOps + cfg.Logger = "zap" + //cfg.LogOutputs = []string{} // FIXME: add a way to pass in our logf func + cfg.LogLevel = "error" // keep things quieter for now cfg.InitialCluster = initialPeerURLsMap.String() // including myself! if newCluster { diff --git a/lib/hello.go b/lib/hello.go index a538cc34..70588157 100644 --- a/lib/hello.go +++ b/lib/hello.go @@ -22,8 +22,6 @@ import ( "log" "os" "time" - - "github.com/coreos/pkg/capnslog" ) func hello(program, version string, flags Flags) { @@ -36,14 +34,7 @@ func hello(program, version string, flags Flags) { logFlags = logFlags - log.Ldate // remove the date for now log.SetFlags(logFlags) - // un-hijack from capnslog... - // XXX: move this to the etcd package when new version deprecates capnslog log.SetOutput(os.Stderr) - if flags.Verbose { - capnslog.SetFormatter(capnslog.NewLogFormatter(os.Stderr, "(etcd) ", logFlags)) - } else { - capnslog.SetFormatter(capnslog.NewNilFormatter()) - } if program == "" { program = ""