summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 17:54:04 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-12-11 17:54:15 +0100
commit9e6fb5106bcb3a0f93a616198ece579c61eb129b (patch)
treed0616027f25ad6a557ac0983c4709a18fc658a11
parent57bdfc8349b3c8a727d6f439e1fd12661bc00a15 (diff)
Always resolved env vars in path of config structure.
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--lib/xdsconfig/configfile.go16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index c252073..500c195 100644
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -59,6 +59,9 @@ type FileConfig struct {
func readGlobalConfig(c *Config, confFile string) error {
+ var fd *os.File
+ var fCfg = FileConfig{}
+
searchIn := make([]string, 0, 3)
if confFile != "" {
searchIn = append(searchIn, confFile)
@@ -78,7 +81,8 @@ func readGlobalConfig(c *Config, confFile string) error {
}
if cFile == nil {
c.Log.Infof("No config file found")
- return nil
+ // always resolved env vars even if no config file found!
+ goto resVars
}
c.Log.Infof("Use config file: %s", *cFile)
@@ -87,11 +91,14 @@ func readGlobalConfig(c *Config, confFile string) error {
// bind with flags (command line options)
// see https://github.com/spf13/viper#working-with-flags
- fd, _ := os.Open(*cFile)
- defer fd.Close()
+ fd, _ = os.Open(*cFile)
+ defer func() {
+ if fd != nil {
+ fd.Close()
+ }
+ }()
// Decode config file content and save it in a first variable
- fCfg := FileConfig{}
if err := json.NewDecoder(fd).Decode(&fCfg); err != nil {
return err
}
@@ -106,6 +113,7 @@ func readGlobalConfig(c *Config, confFile string) error {
}
// Support environment variables (IOW ${MY_ENV_VAR} syntax) in agent-config.json
+resVars:
vars := []*string{
&c.FileConf.LogsDir,
&c.FileConf.WebAppDir,