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

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index 374afa3..a3e0cee 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -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,7 +120,9 @@ 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)
 	}
@@ -132,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
 	}
@@ -141,6 +148,9 @@ 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