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 #14584 from ahrtr/functional_test_check_logoutput

Browse Source 
functional-test: move the check on log-outputs out of the 'if clientTLS' branch
This commit is contained in:
Benjamin Wang 2022-10-13 17:16:35 +08:00 committed by GitHub
commit e19bb869c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/functional/tester/cluster_read_config.go
View File

@ -356,17 +356,17 @@ func read(lg *zap.Logger, fpath string) (*Cluster, error) {
}
clus.Members[i].ClientCertData = string(data)
}
}
if len(mem.Etcd.LogOutputs) == 0 {
return nil, fmt.Errorf("mem.Etcd.LogOutputs cannot be empty")
}
for _, v := range mem.Etcd.LogOutputs {
switch v {
case "stderr", "stdout", "/dev/null", "default":
default:
if !strings.HasPrefix(v, mem.BaseDir) {
return nil, fmt.Errorf("LogOutput %q must be prefixed with BaseDir %q", v, mem.BaseDir)
}
if len(mem.Etcd.LogOutputs) == 0 {
return nil, fmt.Errorf("mem.Etcd.LogOutputs cannot be empty")
}
for _, v := range mem.Etcd.LogOutputs {
switch v {
case "stderr", "stdout", "/dev/null", "default":
default:
if !strings.HasPrefix(v, mem.BaseDir) {
return nil, fmt.Errorf("LogOutput %q must be prefixed with BaseDir %q", v, mem.BaseDir)
}
}
}