summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>2016-08-01 08:09:27 +0000
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-08-02 10:48:58 +0900
commita46e8b6826fe95ff09278d75474faf7a14b5d8b1 (patch)
tree895b74d5c1871c59a0902e4cd7536a2d6a2c2faa
parente847113b526d9389bd939669819c8d56854a93fb (diff)
config: fix error propagatation in default config setting
bug introduced by e97a59c5390fc05ba75673fb4ff7e061c1e73e4f Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>
-rw-r--r--config/default.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/default.go b/config/default.go
index d2911036..ef3da7f1 100644
--- a/config/default.go
+++ b/config/default.go
@@ -233,7 +233,9 @@ func setDefaultConfigValuesWithViper(v *viper.Viper, b *BgpConfigSet) error {
if len(list) > idx {
vv.Set("neighbor", list[idx])
}
- setDefaultNeighborConfigValuesWithViper(vv, &n, b.Global.Config.As)
+ if err := setDefaultNeighborConfigValuesWithViper(vv, &n, b.Global.Config.As); err != nil {
+ return err
+ }
b.Neighbors[idx] = n
}