etcd: export SetFlagsFromEnv
parent
18c300f80c
commit
f7c353a703
6
main.go
6
main.go
|
@ -95,7 +95,7 @@ func main() {
|
|||
flag.Usage = pkg.UsageWithIgnoredFlagsFunc(flag.CommandLine, deprecated)
|
||||
flag.Parse()
|
||||
|
||||
setFlagsFromEnv(flag.CommandLine)
|
||||
SetFlagsFromEnv(flag.CommandLine)
|
||||
|
||||
if string(*proxyFlag) == proxyFlagValueOff {
|
||||
startEtcd()
|
||||
|
@ -329,12 +329,12 @@ func (pf *ProxyFlag) String() string {
|
|||
return string(*pf)
|
||||
}
|
||||
|
||||
// setFlagsFromEnv parses all registered flags in the given flagset,
|
||||
// SetFlagsFromEnv parses all registered flags in the given flagset,
|
||||
// and if they are not already set it attempts to set their values from
|
||||
// environment variables. Environment variables take the name of the flag but
|
||||
// are UPPERCASE, have the prefix "ETCD_", and any dashes are replaced by
|
||||
// underscores - for example: some-flag => ETCD_SOME_FLAG
|
||||
func setFlagsFromEnv(fs *flag.FlagSet) {
|
||||
func SetFlagsFromEnv(fs *flag.FlagSet) {
|
||||
alreadySet := make(map[string]bool)
|
||||
fs.Visit(func(f *flag.Flag) {
|
||||
alreadySet[f.Name] = true
|
||||
|
|
|
@ -30,7 +30,7 @@ func TestSetFlagsFromEnv(t *testing.T) {
|
|||
}
|
||||
|
||||
// now read the env and verify flags were updated as expected
|
||||
setFlagsFromEnv(flag.CommandLine)
|
||||
SetFlagsFromEnv(flag.CommandLine)
|
||||
for f, want := range map[string]string{
|
||||
"data-dir": "/foo/bar",
|
||||
"peer-bind-addr": "1.2.3.4",
|
||||
|
|
Loading…
Reference in New Issue