From a840678ea8b627e8a0f952c07a268e4b0be8ee9c Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 15 May 2017 23:44:01 +0200 Subject: [PATCH] Update doc: add current dir in config.json discovery logic. --- README.md | 3 ++- lib/xdsconfig/fileconfig.go | 3 ++- 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. `/config.json` file +3. `/config.json` file +4. `/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/ /config.json file +// 3/ /agent-config.json file +// 4/ /config.json file func updateConfigFromFile(c *Config, confFile string) error { -- 2.16.6