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

*: use "zap.Field"

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-05-02 13:26:39 -07:00
parent 44385bc7b9
commit 5828efda38
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/etcd.go
View File

@ -28,8 +28,6 @@ import (
"sync" "sync"
"time" "time"
"go.uber.org/zap/zapcore"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/etcdhttp" "github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2http" "github.com/coreos/etcd/etcdserver/api/v2http"
@ -275,7 +273,7 @@ func (e *Etcd) Config() Config {
// Client requests will be terminated with request timeout. // Client requests will be terminated with request timeout.
// After timeout, enforce remaning requests be closed immediately. // After timeout, enforce remaning requests be closed immediately.
func (e *Etcd) Close() { func (e *Etcd) Close() {
fields := []zapcore.Field{ fields := []zap.Field{
zap.String("name", e.cfg.Name), zap.String("name", e.cfg.Name),
zap.String("data-dir", e.cfg.Dir), zap.String("data-dir", e.cfg.Dir),
zap.Strings("advertise-peer-urls", e.cfg.getAPURLs()), zap.Strings("advertise-peer-urls", e.cfg.getAPURLs()),

3
etcdserver/corrupt.go
View File

@ -26,7 +26,6 @@ import (
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore"
) )
// CheckInitialHashKV compares initial hash values with its peers // CheckInitialHashKV compares initial hash values with its peers
@ -58,7 +57,7 @@ func (s *EtcdServer) CheckInitialHashKV() error {
for _, p := range peers { for _, p := range peers {
if p.resp != nil { if p.resp != nil {
peerID := types.ID(p.resp.Header.MemberId) peerID := types.ID(p.resp.Header.MemberId)
fields := []zapcore.Field{ fields := []zap.Field{
zap.String("local-member-id", s.ID().String()), zap.String("local-member-id", s.ID().String()),
zap.Int64("local-member-revision", rev), zap.Int64("local-member-revision", rev),
zap.Int64("local-member-compact-revision", crev), zap.Int64("local-member-compact-revision", crev),

3
etcdserver/server.go
View File

@ -61,7 +61,6 @@ import (
"github.com/coreos/go-semver/semver" "github.com/coreos/go-semver/semver"
"github.com/coreos/pkg/capnslog" "github.com/coreos/pkg/capnslog"
"go.uber.org/zap" "go.uber.org/zap"
"go.uber.org/zap/zapcore"
) )
const ( const (
@ -1816,7 +1815,7 @@ func (s *EtcdServer) sendMergedSnap(merged raftsnap.Message) {
atomic.AddInt64(&s.inflightSnapshots, 1) atomic.AddInt64(&s.inflightSnapshots, 1)
lg := s.getLogger() lg := s.getLogger()
fields := []zapcore.Field{ fields := []zap.Field{
zap.String("from", s.ID().String()), zap.String("from", s.ID().String()),
zap.String("to", types.ID(merged.To).String()), zap.String("to", types.ID(merged.To).String()),
zap.Int64("bytes", merged.TotalSize), zap.Int64("bytes", merged.TotalSize),