etcdmain: discard the http server logging
parent
2e9f6f70d6
commit
3a83ab1b71
|
@ -313,13 +313,13 @@ func startEtcd() (<-chan struct{}, error) {
|
||||||
// Start the peer server in a goroutine
|
// Start the peer server in a goroutine
|
||||||
for _, l := range plns {
|
for _, l := range plns {
|
||||||
go func(l net.Listener) {
|
go func(l net.Listener) {
|
||||||
log.Fatal(http.Serve(l, ph))
|
log.Fatal(serveHTTP(l, ph))
|
||||||
}(l)
|
}(l)
|
||||||
}
|
}
|
||||||
// Start a client server goroutine for each listen address
|
// Start a client server goroutine for each listen address
|
||||||
for _, l := range clns {
|
for _, l := range clns {
|
||||||
go func(l net.Listener) {
|
go func(l net.Listener) {
|
||||||
log.Fatal(http.Serve(l, ch))
|
log.Fatal(serveHTTP(l, ch))
|
||||||
}(l)
|
}(l)
|
||||||
}
|
}
|
||||||
return s.StopNotify(), nil
|
return s.StopNotify(), nil
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
package etcdmain
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"log"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// serveHTTP accepts incoming HTTP connections on the listener l,
|
||||||
|
// creating a new service goroutine for each. The service goroutines
|
||||||
|
// read requests and then call handler to reply to them.
|
||||||
|
func serveHTTP(l net.Listener, handler http.Handler) error {
|
||||||
|
logger := log.New(ioutil.Discard, "etcdhttp", 0)
|
||||||
|
// TODO: add debug flag; enable logging when debug flag is set
|
||||||
|
srv := &http.Server{
|
||||||
|
Handler: handler,
|
||||||
|
ErrorLog: logger, // do not log user error
|
||||||
|
}
|
||||||
|
return srv.Serve(l)
|
||||||
|
}
|
Loading…
Reference in New Issue