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 #8812 from gyuho/default

Browse Source 
embed: NewConfig sets LogOutput to "default"
This commit is contained in:
Gyu-Ho Lee 2017-11-02 16:31:33 -07:00 committed by GitHub
commit ef475b2502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
embed/config.go
View File

@ -55,6 +55,8 @@ const (
DefaultListenPeerURLs = "http://localhost:2380" DefaultListenPeerURLs = "http://localhost:2380"
DefaultListenClientURLs = "http://localhost:2379" DefaultListenClientURLs = "http://localhost:2379"
DefaultLogOutput = "default"
// maxElectionMs specifies the maximum value of election timeout. // maxElectionMs specifies the maximum value of election timeout.
// More details are listed in ../Documentation/tuning.md#time-parameters. // More details are listed in ../Documentation/tuning.md#time-parameters.
maxElectionMs = 50000 maxElectionMs = 50000
@ -225,6 +227,7 @@ func NewConfig() *Config {
ClusterState: ClusterStateFlagNew, ClusterState: ClusterStateFlagNew,
InitialClusterToken: "etcd-cluster", InitialClusterToken: "etcd-cluster",
StrictReconfigCheck: true, StrictReconfigCheck: true,
LogOutput: DefaultLogOutput,
Metrics: "basic", Metrics: "basic",
EnableV2: true, EnableV2: true,
AuthToken: "simple", AuthToken: "simple",
@ -266,9 +269,9 @@ func (cfg *Config) SetupLogging() {
capnslog.SetFormatter(capnslog.NewPrettyFormatter(os.Stdout, cfg.Debug)) capnslog.SetFormatter(capnslog.NewPrettyFormatter(os.Stdout, cfg.Debug))
case "stderr": case "stderr":
capnslog.SetFormatter(capnslog.NewPrettyFormatter(os.Stderr, cfg.Debug)) capnslog.SetFormatter(capnslog.NewPrettyFormatter(os.Stderr, cfg.Debug))
case "default": case DefaultLogOutput:
default: default:
plog.Panicf(`unknown log-output %q (only supports "default", "stdout", "stderr")`, cfg.LogOutput) plog.Panicf(`unknown log-output %q (only supports %q, "stdout", "stderr")`, cfg.LogOutput, DefaultLogOutput)
} }
} }

2
etcdmain/config.go
View File

@ -192,7 +192,7 @@ func newConfig() *config {
// logging // logging
fs.BoolVar(&cfg.Debug, "debug", false, "Enable debug-level logging for etcd.") fs.BoolVar(&cfg.Debug, "debug", false, "Enable debug-level logging for etcd.")
fs.StringVar(&cfg.LogPkgLevels, "log-package-levels", "", "Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG').") fs.StringVar(&cfg.LogPkgLevels, "log-package-levels", "", "Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG').")
fs.StringVar(&cfg.LogOutput, "log-output", "default", "Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.") fs.StringVar(&cfg.LogOutput, "log-output", embed.DefaultLogOutput, "Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd.")
// unsafe // unsafe
fs.BoolVar(&cfg.ForceNewCluster, "force-new-cluster", false, "Force to create a new one member cluster.") fs.BoolVar(&cfg.ForceNewCluster, "force-new-cluster", false, "Force to create a new one member cluster.")