diff --git a/client_handlers.go b/client_handlers.go index b23569795..bfa0c08d5 100644 --- a/client_handlers.go +++ b/client_handlers.go @@ -103,7 +103,8 @@ func dispatch(c Command, w *http.ResponseWriter, req *http.Request, client bool) if raftServer.State() == "leader" { if body, err := raftServer.Do(c); err != nil { if _, ok := err.(store.NotFoundError); ok { - http.NotFound((*w), req) + (*w).WriteHeader(http.StatusNotFound) + (*w).Write(newJsonError(100, err.Error())) return } @@ -129,7 +130,8 @@ func dispatch(c Command, w *http.ResponseWriter, req *http.Request, client bool) } else { if body == nil { - http.NotFound((*w), req) + (*w).WriteHeader(http.StatusNotFound) + (*w).Write(newJsonError(100, err.Error())) } else { body, ok := body.([]byte) // this should not happen @@ -235,7 +237,8 @@ func GetHttpHandler(w *http.ResponseWriter, req *http.Request) { if body, err := command.Apply(raftServer); err != nil { if _, ok := err.(store.NotFoundError); ok { - http.NotFound((*w), req) + (*w).WriteHeader(http.StatusNotFound) + (*w).Write(newJsonError(100, err.Error())) return } diff --git a/etcd.go b/etcd.go index 8fd37c61c..0fb3d2e97 100644 --- a/etcd.go +++ b/etcd.go @@ -178,7 +178,7 @@ func main() { signal.Notify(c, os.Interrupt) go func() { for sig := range c { - log.Printf("captured %v, stopping profiler and exiting..", sig) + fmt.Printf("captured %v, stopping profiler and exiting..", sig) pprof.StopCPUProfile() os.Exit(1) }