|
|
@@ -24,7 +24,6 @@ import (
|
|
|
"net/url"
|
|
|
"os"
|
|
|
"runtime"
|
|
|
- "sort"
|
|
|
"strings"
|
|
|
|
|
|
"go.etcd.io/etcd/embed"
|
|
|
@@ -284,7 +283,7 @@ func (cfg *config) parse(arguments []string) error {
|
|
|
err = cfg.configFromFile(cfg.configFile)
|
|
|
if lg := cfg.ec.GetLogger(); lg != nil {
|
|
|
lg.Info(
|
|
|
- "loaded server configuraionl, other configuration command line flags and environment variables will be ignored if provided",
|
|
|
+ "loaded server configuration, other configuration command line flags and environment variables will be ignored if provided",
|
|
|
zap.String("path", cfg.configFile),
|
|
|
)
|
|
|
} else {
|
|
|
@@ -315,21 +314,8 @@ func (cfg *config) configFromCmdLine() error {
|
|
|
cfg.ec.CipherSuites = flags.StringsFromFlag(cfg.cf.flagSet, "cipher-suites")
|
|
|
|
|
|
// TODO: remove this in v3.5
|
|
|
- output := flags.UniqueStringsMapFromFlag(cfg.cf.flagSet, "log-output")
|
|
|
- oss1 := make([]string, 0, len(output))
|
|
|
- for v := range output {
|
|
|
- oss1 = append(oss1, v)
|
|
|
- }
|
|
|
- sort.Strings(oss1)
|
|
|
- cfg.ec.DeprecatedLogOutput = oss1
|
|
|
-
|
|
|
- outputs := flags.UniqueStringsMapFromFlag(cfg.cf.flagSet, "log-outputs")
|
|
|
- oss2 := make([]string, 0, len(outputs))
|
|
|
- for v := range outputs {
|
|
|
- oss2 = append(oss2, v)
|
|
|
- }
|
|
|
- sort.Strings(oss2)
|
|
|
- cfg.ec.LogOutputs = oss2
|
|
|
+ cfg.ec.DeprecatedLogOutput = flags.UniqueStringsFromFlag(cfg.cf.flagSet, "log-output")
|
|
|
+ cfg.ec.LogOutputs = flags.UniqueStringsFromFlag(cfg.cf.flagSet, "log-outputs")
|
|
|
|
|
|
cfg.ec.ClusterState = cfg.cf.clusterState.String()
|
|
|
cfg.cp.Fallback = cfg.cf.fallback.String()
|