diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-02-25 21:45:26 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-02-25 21:45:26 +0900 |
| commit | 149f1f2ea90e9d92a5839a45dcd8e533d0055efe (patch) | |
| tree | aa72a87e169c02a6dbe78fa60e681324dcbc78d9 /config/serve.go | |
| parent | 8d1ad9a4bdb4206e3a1999f74b8979a3bb55761e (diff) | |
config: set default config value only when not specified
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'config/serve.go')
| -rw-r--r-- | config/serve.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/config/serve.go b/config/serve.go index 02eb2e6e..924dc27d 100644 --- a/config/serve.go +++ b/config/serve.go @@ -10,14 +10,11 @@ func ReadConfigfileServe(path string, configCh chan BgpType, reloadCh chan bool) <-reloadCh b := BgpType{} - _, err := toml.DecodeFile(path, &b) + md, err := toml.DecodeFile(path, &b) if err != nil { - log.Fatal("can't read config file ", path) + log.Fatal("can't read config file ", path, err) } else { - // TODO: validate configuration - for i, _ := range b.NeighborList { - SetNeighborTypeDefault(&b.NeighborList[i]) - } + SetDefaultConfigValues(md, &b) } configCh <- b |