From 8f943f2f45004388ae99e219858b6c04557a0894 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 29 Dec 2015 16:48:40 -0800 Subject: [PATCH] etcdserver/etcdhttp: use MergeLogger to log etcdserver errors Related https://github.com/coreos/etcd/issues/3812. --- etcdserver/etcdhttp/client.go | 4 ++-- etcdserver/etcdhttp/http.go | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/etcdserver/etcdhttp/client.go b/etcdserver/etcdhttp/client.go index d8082769a..fec6ca840 100644 --- a/etcdserver/etcdhttp/client.go +++ b/etcdserver/etcdhttp/client.go @@ -605,9 +605,9 @@ func writeKeyError(w http.ResponseWriter, err error) { default: switch err { case etcdserver.ErrTimeoutDueToLeaderFail, etcdserver.ErrTimeoutDueToConnectionLost: - plog.Error(err) + mlog.MergeError(err) default: - plog.Errorf("got unexpected response error (%v)", err) + mlog.MergeErrorf("got unexpected response error (%v)", err) } ee := etcdErr.NewError(etcdErr.EcodeRaftInternal, err.Error(), 0) ee.WriteTo(w) diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go index ed6695228..246c31266 100644 --- a/etcdserver/etcdhttp/http.go +++ b/etcdserver/etcdhttp/http.go @@ -26,6 +26,7 @@ import ( "github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver/auth" "github.com/coreos/etcd/etcdserver/etcdhttp/httptypes" + "github.com/coreos/etcd/pkg/logutil" ) const ( @@ -35,6 +36,7 @@ const ( var ( plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "etcdhttp") + mlog = logutil.NewMergeLogger(plog) errClosed = errors.New("etcdhttp: client closed connection") ) @@ -60,9 +62,9 @@ func writeError(w http.ResponseWriter, r *http.Request, err error) { default: switch err { case etcdserver.ErrTimeoutDueToLeaderFail, etcdserver.ErrTimeoutDueToConnectionLost, etcdserver.ErrNotEnoughStartedMembers: - plog.Error(err) + mlog.MergeError(err) default: - plog.Errorf("got unexpected response error (%v)", err) + mlog.MergeErrorf("got unexpected response error (%v)", err) } herr := httptypes.NewHTTPError(http.StatusInternalServerError, "Internal Server Error") if et := herr.WriteTo(w); et != nil {