Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*: support output logs to multiple files #9579

Merged
merged 12 commits into from
Apr 17, 2018
+321 −238
Merged

*: support output logs to multiple files #9579

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f6f1e0c
embed: support multiple log outputs for structured logging
gyuho Apr 17, 2018
954afc9
CHANGELOG-3.4: highlight multi-log writer change
gyuho Apr 17, 2018
bf93753
embed: change "Config.LogOutput" to []string
gyuho Apr 17, 2018
1974785
etcdmain: accept multiple values in "--log-output"
gyuho Apr 17, 2018
3e99487
snapshot: set string for LogOutput
gyuho Apr 17, 2018
cd7bfe1
integration: set strings for LogOutput
gyuho Apr 17, 2018
8049df1
CHANGELOG-3.4: highlight embed.Config.LogOutput field change
gyuho Apr 17, 2018
671e4a5
CHANGELOG-3.4: add "LogOutput" change
gyuho Apr 17, 2018
8ee8778
functional: use strings for LogOutput
gyuho Apr 17, 2018
7215e54
etcd.conf.yml: change "log-output" type
gyuho Apr 17, 2018
bf86016
Documentation/upgrades: highlight YAML change
gyuho Apr 17, 2018
6fec93f
CHANGELOG-3.4: highlight YAML log-output change
gyuho Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
snapshot: set string for LogOutput 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
@gyuho
gyuho committed Apr 17, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 3e99487372a09b1469d40a3c37f20af5e3e8cdb1
2 changes: 1 addition & 1 deletion snapshot/member_test.go
View file
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) {

cfg := embed.NewConfig()
cfg.Logger = "zap"
cfg.LogOutput = "/dev/null"
cfg.LogOutput = []string{"/dev/null"}
cfg.Debug = false
cfg.Name = "3"
cfg.InitialClusterToken = testClusterTkn
6 changes: 3 additions & 3 deletions snapshot/v3_snapshot_test.go
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ func TestSnapshotV3RestoreSingle(t *testing.T) {

cfg := embed.NewConfig()
cfg.Logger = "zap"
cfg.LogOutput = "/dev/null"
cfg.LogOutput = []string{"/dev/null"}
cfg.Debug = false
cfg.Name = "s1"
cfg.InitialClusterToken = testClusterTkn
@@ -153,7 +153,7 @@ func createSnapshotFile(t *testing.T, kvs []kv) string {

cfg := embed.NewConfig()
cfg.Logger = "zap"
cfg.LogOutput = "/dev/null"
cfg.LogOutput = []string{"/dev/null"}
cfg.Debug = false
cfg.Name = "default"
cfg.ClusterState = "new"
@@ -220,7 +220,7 @@ func restoreCluster(t *testing.T, clusterN int, dbPath string) (
for i := 0; i < clusterN; i++ {
cfg := embed.NewConfig()
cfg.Logger = "zap"
cfg.LogOutput = "/dev/null"
cfg.LogOutput = []string{"/dev/null"}
cfg.Debug = false
cfg.Name = fmt.Sprintf("%d", i)
cfg.InitialClusterToken = testClusterTkn