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

pkg/logutil, etcdserver: Move zap-raft logger to etcdserver.

Browse Source 
This package depends on raft and is solelly used by etcdserver/raft.go.
So it does not fullfills conditions of:
```
pkg/ is a collection of utility packages used by etcd without being specific to etcd itself. A package belongs here
only if it could possibly be moved out into its own repository in the future.
```
This commit is contained in:
Piotr Tabor 2020-09-30 09:16:07 +02:00
parent 5ba46f625f
commit 1983c89e27
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etcdserver/raft.go
View File

@ -122,11 +122,11 @@ type raftNodeConfig struct {
func newRaftNode(cfg raftNodeConfig) *raftNode { func newRaftNode(cfg raftNodeConfig) *raftNode {
var lg raft.Logger var lg raft.Logger
if cfg.lg != nil { if cfg.lg != nil {
lg = logutil.NewRaftLoggerZap(cfg.lg) lg = NewRaftLoggerZap(cfg.lg)
} else { } else {
lcfg := logutil.DefaultZapLoggerConfig lcfg := logutil.DefaultZapLoggerConfig
var err error var err error
lg, err = logutil.NewRaftLogger(&lcfg) lg, err = NewRaftLogger(&lcfg)
if err != nil { if err != nil {
log.Fatalf("cannot create raft logger %v", err) log.Fatalf("cannot create raft logger %v", err)
} }
@ -463,12 +463,12 @@ func startNode(cfg ServerConfig, cl *membership.RaftCluster, ids []types.ID) (id
if cfg.Logger != nil { if cfg.Logger != nil {
// called after capnslog setting in "init" function // called after capnslog setting in "init" function
if cfg.LoggerConfig != nil { if cfg.LoggerConfig != nil {
c.Logger, err = logutil.NewRaftLogger(cfg.LoggerConfig) c.Logger, err = NewRaftLogger(cfg.LoggerConfig)
if err != nil { if err != nil {
log.Fatalf("cannot create raft logger %v", err) log.Fatalf("cannot create raft logger %v", err)
} }
} else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil { } else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil {
c.Logger = logutil.NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer) c.Logger = NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer)
} }
} }
@ -518,12 +518,12 @@ func restartNode(cfg ServerConfig, snapshot *raftpb.Snapshot) (types.ID, *member
// called after capnslog setting in "init" function // called after capnslog setting in "init" function
var err error var err error
if cfg.LoggerConfig != nil { if cfg.LoggerConfig != nil {
c.Logger, err = logutil.NewRaftLogger(cfg.LoggerConfig) c.Logger, err = NewRaftLogger(cfg.LoggerConfig)
if err != nil { if err != nil {
log.Fatalf("cannot create raft logger %v", err) log.Fatalf("cannot create raft logger %v", err)
} }
} else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil { } else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil {
c.Logger = logutil.NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer) c.Logger = NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer)
} }
} }
@ -602,12 +602,12 @@ func restartAsStandaloneNode(cfg ServerConfig, snapshot *raftpb.Snapshot) (types
if cfg.Logger != nil { if cfg.Logger != nil {
// called after capnslog setting in "init" function // called after capnslog setting in "init" function
if cfg.LoggerConfig != nil { if cfg.LoggerConfig != nil {
c.Logger, err = logutil.NewRaftLogger(cfg.LoggerConfig) c.Logger, err = NewRaftLogger(cfg.LoggerConfig)
if err != nil { if err != nil {
log.Fatalf("cannot create raft logger %v", err) log.Fatalf("cannot create raft logger %v", err)
} }
} else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil { } else if cfg.LoggerCore != nil && cfg.LoggerWriteSyncer != nil {
c.Logger = logutil.NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer) c.Logger = NewRaftLoggerFromZapCore(cfg.LoggerCore, cfg.LoggerWriteSyncer)
} }
} }

2
pkg/logutil/zap_raft.go → etcdserver/zap_raft.go
View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package logutil package etcdserver
import ( import (
"errors" "errors"

12
pkg/logutil/zap_raft_test.go → etcdserver/zap_raft_test.go
View File

@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package logutil package etcdserver
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"go.etcd.io/etcd/v3/pkg/logutil"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"testing" "testing"
"time" "time"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
) )
func TestNewRaftLogger(t *testing.T) { func TestNewRaftLogger(t *testing.T) {
@ -40,7 +40,7 @@ func TestNewRaftLogger(t *testing.T) {
Thereafter: 100, Thereafter: 100,
}, },
Encoding: "json", Encoding: "json",
EncoderConfig: DefaultZapLoggerConfig.EncoderConfig, EncoderConfig: logutil.DefaultZapLoggerConfig.EncoderConfig,
OutputPaths: []string{logPath}, OutputPaths: []string{logPath},
ErrorOutputPaths: []string{logPath}, ErrorOutputPaths: []string{logPath},
} }
@ -66,7 +66,7 @@ func TestNewRaftLogger(t *testing.T) {
if !bytes.Contains(data, []byte("etcd-logutil-2")) { if !bytes.Contains(data, []byte("etcd-logutil-2")) {
t.Fatalf("can't find data in log %q", string(data)) t.Fatalf("can't find data in log %q", string(data))
} }
if !bytes.Contains(data, []byte("logutil/zap_raft_test.go:")) { if !bytes.Contains(data, []byte("zap_raft_test.go:")) {
t.Fatalf("unexpected caller; %q", string(data)) t.Fatalf("unexpected caller; %q", string(data))
} }
} }