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
/
config.go
diff --git
a/lib/xdsconfig/config.go
b/lib/xdsconfig/config.go
index
7d762c7
..
854d383
100644
(file)
--- a/
lib/xdsconfig/config.go
+++ b/
lib/xdsconfig/config.go
@@
-25,7
+25,6
@@
type Config struct {
// Config default values
const (
DefaultAPIVersion = "1"
// Config default values
const (
DefaultAPIVersion = "1"
- DefaultPort = "8010"
DefaultLogLevel = "error"
)
DefaultLogLevel = "error"
)
@@
-39,8
+38,14
@@
func Init(ctx *cli.Context, log *logrus.Logger) (*Config, error) {
APIVersion: DefaultAPIVersion,
VersionGitTag: ctx.App.Metadata["git-tag"].(string),
APIVersion: DefaultAPIVersion,
VersionGitTag: ctx.App.Metadata["git-tag"].(string),
- HTTPPort: DefaultPort,
- Log: log,
+ HTTPPort: "8010",
+ FileConf: &FileConfig{
+ LogsDir: "/tmp/logs",
+ SThgConf: &SyncThingConf{
+ Home: "${HOME}/.xds/agent/syncthing-config",
+ },
+ },
+ Log: log,
}
// config file settings overwrite default config
}
// config file settings overwrite default config