X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;h=57e7043f0cfd5404bbafb83e713ff40655f88592;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=b786a24d808741fee783393c3cff962a3f29f9f0;hpb=b4ea2f3048518455b80262c16ebaa80d3cc7bba6;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index b786a24..57e7043 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
 )
 
 const (
@@ -50,13 +50,15 @@ type SyncThingConf struct {
 
 // FileConfig is the JSON structure of xds-server config file (server-config.json)
 type FileConfig struct {
-	WebAppDir     string         `json:"webAppDir"`
-	ShareRootDir  string         `json:"shareRootDir"`
-	SdkScriptsDir string         `json:"sdkScriptsDir"`
-	SdkDbUpdate   string         `json:"sdkDbUpdate"`
-	HTTPPort      string         `json:"httpPort"`
-	SThgConf      *SyncThingConf `json:"syncthing"`
-	LogsDir       string         `json:"logsDir"`
+	WebAppDir          string         `json:"webAppDir"`
+	ShareRootDir       string         `json:"shareRootDir"`
+	SdkScriptsDir      string         `json:"sdkScriptsDir"`
+	XdsUtilsScriptsDir string         `json:"xdsUtilsScriptsDir"`
+	SdkDbUpdate        string         `json:"sdkDbUpdate"`
+	HTTPPort           string         `json:"httpPort"`
+	SThgConf           *SyncThingConf `json:"syncthing"`
+	LogsDir            string         `json:"logsDir"`
+	XdsSrvUpdateTime   string         `json:"xdsSrvUpdateTime"`
 }
 
 // readGlobalConfig reads configuration from a config file.
@@ -118,17 +120,12 @@ func readGlobalConfig(c *Config, confFile string) error {
 		&fCfg.WebAppDir,
 		&fCfg.ShareRootDir,
 		&fCfg.SdkScriptsDir,
-		&fCfg.LogsDir}
+		&fCfg.XdsUtilsScriptsDir,
+		&fCfg.LogsDir,
+		&fCfg.XdsSrvUpdateTime}
 	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
@@ -139,6 +136,9 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.SdkScriptsDir == "" {
 		fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
 	}
+	if fCfg.XdsUtilsScriptsDir == "" {
+		fCfg.XdsUtilsScriptsDir = c.FileConf.XdsUtilsScriptsDir
+	}
 	if fCfg.SdkDbUpdate == "" {
 		fCfg.SdkDbUpdate = c.FileConf.SdkDbUpdate
 	}
@@ -148,6 +148,16 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.LogsDir == "" {
 		fCfg.LogsDir = c.FileConf.LogsDir
 	}
+	if fCfg.XdsSrvUpdateTime == "" {
+		fCfg.XdsSrvUpdateTime = c.FileConf.XdsSrvUpdateTime
+	}
+
+	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, " ")