Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver/etcdhttp: use MergeLogger to log etcdserver errors

Browse Source 
Related https://github.com/coreos/etcd/issues/3812.
This commit is contained in:
Gyu-Ho Lee 2015-12-29 16:48:40 -08:00
parent 64032541c3
commit 8f943f2f45
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdserver/etcdhttp/client.go
View File

@ -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)

6
etcdserver/etcdhttp/http.go
View File

@ -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 {