From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Mon, 15 May 2017 21:44:01 +0000 (+0200)
Subject: Update doc: add current dir in config.json discovery logic.
X-Git-Tag: v0.0.1-alpha~36
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=a840678ea8b627e8a0f952c07a268e4b0be8ee9c

Update doc: add current dir in config.json discovery logic.
---

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 {