X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;fp=lib%2Fxdsconfig%2Ffileconfig.go;h=374afa37a9ac43efca9d40de1442fa196ad0ad56;hb=4982769bd48b5c67c5eff4d9c6f297fa2a7531a4;hp=b786a24d808741fee783393c3cff962a3f29f9f0;hpb=de8154b545ecdd5a35a0956ac5d93e26bb8ebc19;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index b786a24..374afa3 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -122,13 +122,6 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.SThgConf != nil {
 		vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
 	}
-	for _, field := range vars {
-		var err error
-		if *field, err = common.ResolveEnvVar(*field); err != nil {
-			return err
-		}
-	}
-
 	// Use config file settings else use default config
 	if fCfg.WebAppDir == "" {
 		fCfg.WebAppDir = c.FileConf.WebAppDir
@@ -149,6 +142,13 @@ func readGlobalConfig(c *Config, confFile string) error {
 		fCfg.LogsDir = c.FileConf.LogsDir
 	}
 
+	for _, field := range vars {
+		var err error
+		if *field, err = common.ResolveEnvVar(*field); err != nil {
+			return err
+		}
+	}
+
 	// Resolve webapp dir (support relative or full path)
 	fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")
 	if !strings.HasPrefix(fCfg.WebAppDir, "/") && exePath != "" {