From 69553319010f135679899e68d4afed7c6f47d106 Mon Sep 17 00:00:00 2001 From: Andrey Abramov Date: Sat, 25 May 2019 23:54:19 +0300 Subject: [PATCH] etcdmain: fix ignoring of ETCD_CONFIG_FILE env variable Fixes #10747 Signed-off-by: Andrey Abramov --- etcdmain/config.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etcdmain/config.go b/etcdmain/config.go index e70f7df1b..a81ecc5dd 100644 --- a/etcdmain/config.go +++ b/etcdmain/config.go @@ -283,6 +283,11 @@ func (cfg *config) parse(arguments []string) error { } var err error + + if cfg.configFile == "" { + cfg.configFile = os.Getenv("ETCD_CONFIG_FILE") + } + if cfg.configFile != "" { err = cfg.configFromFile(cfg.configFile) if lg := cfg.ec.GetLogger(); lg != nil {