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
Update SDK definition - add flounder
[src/xds/xds-server.git]
/
lib
/
xdsconfig
/
fileconfig.go
diff --git
a/lib/xdsconfig/fileconfig.go
b/lib/xdsconfig/fileconfig.go
index
bf8aa25
..
b786a24
100644
(file)
--- a/
lib/xdsconfig/fileconfig.go
+++ b/
lib/xdsconfig/fileconfig.go
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017
-2018
"IoT.bzh"
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-25,12
+25,9
@@
import (
"path/filepath"
"strings"
"path/filepath"
"strings"
- common "g
ithub.com/iotbzh/xds-common
/golib"
+ common "g
errit.automotivelinux.org/gerrit/src/xds/xds-common.git
/golib"
)
)
-// ConfigDir Directory in user HOME directory where xds config will be saved
-var ConfigDir = path.Join(".xds", "server")
-
const (
// GlobalConfigFilename Global config filename
GlobalConfigFilename = "server-config.json"
const (
// GlobalConfigFilename Global config filename
GlobalConfigFilename = "server-config.json"
@@
-38,6
+35,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
+53,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"`
@@
-71,8
+71,8
@@
func readGlobalConfig(c *Config, confFile string) error {
if confFile != "" {
searchIn = append(searchIn, confFile)
}
if confFile != "" {
searchIn = append(searchIn, confFile)
}
- if
usr
, err := user.Current(); err == nil {
- searchIn = append(searchIn, path.Join(
usr.HomeDir, ConfigDir
, GlobalConfigFilename))
+ if
_
, err := user.Current(); err == nil {
+ searchIn = append(searchIn, path.Join(
ConfigRootDir()
, GlobalConfigFilename))
}
searchIn = append(searchIn, "/etc/xds/server/server-config.json")
}
searchIn = append(searchIn, "/etc/xds/server/server-config.json")
@@
-139,6
+139,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
}
@@
-166,19
+169,20
@@
func readGlobalConfig(c *Config, confFile string) error {
}
func configFilenameGet(cfgFile string) (string, error) {
}
func configFilenameGet(cfgFile string) (string, error) {
- usr, err := user.Current()
- if err != nil {
- return "", err
- }
- return path.Join(usr.HomeDir, ConfigDir, cfgFile), nil
+ return path.Join(ConfigRootDir(), 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)
}