Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix default config values.
[src/xds/xds-agent.git]
/
lib
/
xdsconfig
/
fileconfig.go
diff --git
a/lib/xdsconfig/fileconfig.go
b/lib/xdsconfig/fileconfig.go
index
3c834fc
..
2358a31
100644
(file)
--- a/
lib/xdsconfig/fileconfig.go
+++ b/
lib/xdsconfig/fileconfig.go
@@
-7,7
+7,7
@@
import (
"path"
"path/filepath"
"path"
"path/filepath"
-
"github.com/iotbzh/xds-agent/lib/common
"
+
common "github.com/iotbzh/xds-common/golib
"
)
type SyncThingConf struct {
)
type SyncThingConf struct {
@@
-27,7
+27,7
@@
type FileConfig struct {
// getConfigFromFile reads configuration from a config file.
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
// getConfigFromFile reads configuration from a config file.
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
-// 2/ $HOME/.xds/agent-config.json file
+// 2/ $HOME/.xds/agent
/agent
-config.json file
// 3/ <current_dir>/agent-config.json file
// 4/ <executable dir>/agent-config.json file
// 3/ <current_dir>/agent-config.json file
// 4/ <executable dir>/agent-config.json file
@@
-38,7
+38,7
@@
func updateConfigFromFile(c *Config, confFile string) (*FileConfig, error) {
searchIn = append(searchIn, confFile)
}
if usr, err := user.Current(); err == nil {
searchIn = append(searchIn, confFile)
}
if usr, err := user.Current(); err == nil {
- searchIn = append(searchIn, path.Join(usr.HomeDir, ".xds", "agent-config.json"))
+ searchIn = append(searchIn, path.Join(usr.HomeDir, ".xds", "agent
", "agent
-config.json"))
}
cwd, err := os.Getwd()
if err == nil {
}
cwd, err := os.Getwd()
if err == nil {
@@
-56,30
+56,32
@@
func updateConfigFromFile(c *Config, confFile string) (*FileConfig, error) {
break
}
}
break
}
}
- fCfg := FileConfig{}
- if cFile == nil {
- // No config file found
- return &fCfg, nil
- }
+ // Use default settings
+ fCfg := *c.FileConf
- c.Log.Infof("Use config file: %s", *cFile)
+ // Read config file when existing
+ if cFile != nil {
+ c.Log.Infof("Use config file: %s", *cFile)
- // TODO move on viper package to support comments in JSON and also
- // bind with flags (command line options)
- // see https://github.com/spf13/viper#working-with-flags
+
// TODO move on viper package to support comments in JSON and also
+
// bind with flags (command line options)
+
// see https://github.com/spf13/viper#working-with-flags
- fd, _ := os.Open(*cFile)
- defer fd.Close()
- if err := json.NewDecoder(fd).Decode(&fCfg); err != nil {
- return nil, err
+ fd, _ := os.Open(*cFile)
+ defer fd.Close()
+ if err := json.NewDecoder(fd).Decode(&fCfg); err != nil {
+ return nil, err
+ }
}
// Support environment variables (IOW ${MY_ENV_VAR} syntax) in agent-config.json
}
// Support environment variables (IOW ${MY_ENV_VAR} syntax) in agent-config.json
-
for _, field := range
[]*string{
+
vars :=
[]*string{
&fCfg.LogsDir,
&fCfg.LogsDir,
- &fCfg.SThgConf.Home,
- &fCfg.SThgConf.BinDir} {
-
+ }
+ if fCfg.SThgConf != nil {
+ vars = append(vars, &fCfg.SThgConf.Home, &fCfg.SThgConf.BinDir)
+ }
+ for _, field := range vars {
var err error
*field, err = common.ResolveEnvVar(*field)
if err != nil {
var err error
*field, err = common.ResolveEnvVar(*field)
if err != nil {
@@
-92,5
+94,11
@@
func updateConfigFromFile(c *Config, confFile string) (*FileConfig, error) {
c.HTTPPort = fCfg.HTTPPort
}
c.HTTPPort = fCfg.HTTPPort
}
+ // Set default apikey
+ // FIXME - rework with dynamic key
+ if fCfg.XDSAPIKey == "" {
+ fCfg.XDSAPIKey = "1234abcezam"
+ }
+
return &fCfg, nil
}
return &fCfg, nil
}