X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsconfig%2Ffileconfig.go;fp=lib%2Fxdsconfig%2Ffileconfig.go;h=0b248cd37ac09850a78fbc18a93965a6c4abffba;hb=2e17a524738982174794370a2bb609872608a5ac;hp=b786a24d808741fee783393c3cff962a3f29f9f0;hpb=95293a7ee22cfff9c49a19bd7ae205529d812fa9;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index b786a24..0b248cd 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"`
+	XdsSrvUpdateScriptsDir string         `json:"xdsSrvUpdateScriptsDir"`
+	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.XdsSrvUpdateScriptsDir,
+		&fCfg.LogsDir,
+		&fCfg.XdsSrvUpdateTime}
 	if fCfg.SThgConf != nil {
 		vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
 	}
@@ -139,6 +143,9 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.SdkScriptsDir == "" {
 		fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
 	}
+	if fCfg.XdsSrvUpdateScriptsDir == "" {
+		fCfg.XdsSrvUpdateScriptsDir = c.FileConf.XdsSrvUpdateScriptsDir
+	}
 	if fCfg.SdkDbUpdate == "" {
 		fCfg.SdkDbUpdate = c.FileConf.SdkDbUpdate
 	}
@@ -148,6 +155,9 @@ func readGlobalConfig(c *Config, confFile string) error {
 	if fCfg.LogsDir == "" {
 		fCfg.LogsDir = c.FileConf.LogsDir
 	}
+	if fCfg.XdsSrvUpdateTime == "" {
+		fCfg.XdsSrvUpdateTime = c.FileConf.XdsSrvUpdateTime
+	}
 
 	// Resolve webapp dir (support relative or full path)
 	fCfg.WebAppDir = strings.Trim(fCfg.WebAppDir, " ")