Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added target and terminal support.
[src/xds/xds-server.git]
/
lib
/
xdsconfig
/
fileconfig.go
diff --git
a/lib/xdsconfig/fileconfig.go
b/lib/xdsconfig/fileconfig.go
index
46afc57
..
86f39b5
100644
(file)
--- a/
lib/xdsconfig/fileconfig.go
+++ b/
lib/xdsconfig/fileconfig.go
@@
-38,6
+38,8
@@
const (
ServerDataFilename = "server-data.xml"
// FoldersConfigFilename Folders config filename
FoldersConfigFilename = "server-config_folders.xml"
ServerDataFilename = "server-data.xml"
// FoldersConfigFilename Folders config filename
FoldersConfigFilename = "server-config_folders.xml"
+ // TargetsConfigFilename Targets config filename
+ TargetsConfigFilename = "server-config_targets.xml"
)
// SyncThingConf definition
)
// SyncThingConf definition
@@
-54,6
+56,7
@@
type FileConfig struct {
WebAppDir string `json:"webAppDir"`
ShareRootDir string `json:"shareRootDir"`
SdkScriptsDir string `json:"sdkScriptsDir"`
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"`
HTTPPort string `json:"httpPort"`
SThgConf *SyncThingConf `json:"syncthing"`
LogsDir string `json:"logsDir"`
@@
-139,6
+142,9
@@
func readGlobalConfig(c *Config, confFile string) error {
if fCfg.SdkScriptsDir == "" {
fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
}
if fCfg.SdkScriptsDir == "" {
fCfg.SdkScriptsDir = c.FileConf.SdkScriptsDir
}
+ if fCfg.SdkDbUpdate == "" {
+ fCfg.SdkDbUpdate = c.FileConf.SdkDbUpdate
+ }
if fCfg.HTTPPort == "" {
fCfg.HTTPPort = c.FileConf.HTTPPort
}
if fCfg.HTTPPort == "" {
fCfg.HTTPPort = c.FileConf.HTTPPort
}
@@
-173,12
+179,17
@@
func configFilenameGet(cfgFile string) (string, error) {
return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
}
return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
}
-// FoldersConfigFilenameGet
+// FoldersConfigFilenameGet
Return the FoldersConfig filename
func FoldersConfigFilenameGet() (string, error) {
return configFilenameGet(FoldersConfigFilename)
}
func FoldersConfigFilenameGet() (string, error) {
return configFilenameGet(FoldersConfigFilename)
}
-// ServerDataFilenameGet
+// TargetsConfigFilenameGet Return the TargetsConfig filename
+func TargetsConfigFilenameGet() (string, error) {
+ return configFilenameGet(TargetsConfigFilename)
+}
+
+// ServerDataFilenameGet Return the ServerData filename
func ServerDataFilenameGet() (string, error) {
return configFilenameGet(ServerDataFilename)
}
func ServerDataFilenameGet() (string, error) {
return configFilenameGet(ServerDataFilename)
}