aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-05-15 23:44:01 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-05-15 23:44:01 +0200
commita840678ea8b627e8a0f952c07a268e4b0be8ee9c (patch)
tree0ab9257bc2374e65a9f9c138d5e5975618f202b4
parent9f6d0e831bd8fae07118ba26a61f4fdf8e8bc655 (diff)
Update doc: add current dir in config.json discovery logic.
-rw-r--r--README.md3
-rw-r--r--lib/xdsconfig/fileconfig.go3
2 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index 789a367..9615041 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,8 @@ xds-server configuration is driven by a JSON config file (`config.json`).
Here is the logic to determine which `config.json` file will be used:
1. from command line option: `--config myConfig.json`
2. `$HOME/.xds/config.json` file
-3. `<xds-server executable dir>/config.json` file
+3. `<current dir>/config.json` file
+4. `<xds-server executable dir>/config.json` file
Supported fields in configuration file are:
```json
diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index ed3e82d..7370ed0 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -28,7 +28,8 @@ type FileConfig struct {
// Order to determine which config file is used:
// 1/ from command line option: "--config myConfig.json"
// 2/ $HOME/.xds/config.json file
-// 3/ <xds-server executable dir>/config.json file
+// 3/ <current_dir>/agent-config.json file
+// 4/ <xds-server executable dir>/config.json file
func updateConfigFromFile(c *Config, confFile string) error {