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

Merge pull request #12968 from serathius/logger-simplify

Browse Source 
server: Simplify passing logger setup by passing only logger
This commit is contained in:
Piotr Tabor
2021-05-15 15:58:00 +02:00
committed by GitHub
parent ddc4f473c9 41ed74824e
commit 85341e08f2
5 changed files with 6 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/config/config.go
View File

@@ -30,7 +30,6 @@ import (
bolt "go.etcd.io/bbolt"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
// ServerConfig holds the configuration of etcd as taken from the command line or discovery.
@@ -144,17 +143,8 @@ type ServerConfig struct {
SocketOpts transport.SocketOpts
// Logger logs server-side operations.
// If not nil, it disables "capnslog" and uses the given logger.
Logger *zap.Logger
// LoggerConfig is server logger configuration for Raft logger.
// Must be either: "LoggerConfig != nil" or "LoggerCore != nil && LoggerWriteSyncer != nil".
LoggerConfig *zap.Config
// LoggerCore is "zapcore.Core" for raft logger.
// Must be either: "LoggerConfig != nil" or "LoggerCore != nil && LoggerWriteSyncer != nil".
LoggerCore zapcore.Core
LoggerWriteSyncer zapcore.WriteSyncer
ForceNewCluster bool
// EnableLeaseCheckpoint enables primary lessor to persist lease remainingTTL to prevent indefinite auto-renewal of long lived leases.