diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2018-07-16 20:55:16 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2018-07-24 09:31:36 +0900 |
commit | 775ed7af04ad385df7ba90fc1b0507f9570754b0 (patch) | |
tree | 689d7fa70aa5ab79a4ad708c1537c02c9ed0fad9 | |
parent | fb999f325b7b160df371145eb6fb29fbb5c73f21 (diff) |
fix unittest warnings with go tip
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r-- | internal/pkg/config/serve.go | 12 | ||||
-rw-r--r-- | internal/pkg/table/path.go | 2 | ||||
-rw-r--r-- | pkg/server/fsm.go | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/internal/pkg/config/serve.go b/internal/pkg/config/serve.go index 6b09af6e..19b731b4 100644 --- a/internal/pkg/config/serve.go +++ b/internal/pkg/config/serve.go @@ -93,10 +93,10 @@ func UpdatePeerGroupConfig(curC, newC *BgpConfigSet) ([]PeerGroup, []PeerGroup, } else if !n.Equal(&curC.PeerGroups[idx]) { log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("Current peer-group config:%s", curC.PeerGroups[idx]) + }).Debugf("Current peer-group config:%v", curC.PeerGroups[idx]) log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("New peer-group config:%s", n) + }).Debugf("New peer-group config:%v", n) updatedPg = append(updatedPg, n) } } @@ -120,10 +120,10 @@ func UpdateNeighborConfig(curC, newC *BgpConfigSet) ([]Neighbor, []Neighbor, []N } else if !n.Equal(&curC.Neighbors[idx]) { log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("Current neighbor config:%s", curC.Neighbors[idx]) + }).Debugf("Current neighbor config:%v", curC.Neighbors[idx]) log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("New neighbor config:%s", n) + }).Debugf("New neighbor config:%v", n) updated = append(updated, n) } } @@ -140,10 +140,10 @@ func CheckPolicyDifference(currentPolicy *RoutingPolicy, newPolicy *RoutingPolic log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("Current policy:%s", currentPolicy) + }).Debugf("Current policy:%v", currentPolicy) log.WithFields(log.Fields{ "Topic": "Config", - }).Debugf("New policy:%s", newPolicy) + }).Debugf("New policy:%v", newPolicy) var result bool if currentPolicy == nil && newPolicy == nil { diff --git a/internal/pkg/table/path.go b/internal/pkg/table/path.go index d6407882..55748b08 100644 --- a/internal/pkg/table/path.go +++ b/internal/pkg/table/path.go @@ -305,7 +305,7 @@ func UpdatePathAttrs(global *config.Global, peer *config.Neighbor, info *PeerInf log.WithFields(log.Fields{ "Topic": "Peer", "Key": peer.State.NeighborAddress, - }).Warnf("invalid peer type: %d", peer.State.PeerType) + }).Warnf("invalid peer type: %v", peer.State.PeerType) } return path } diff --git a/pkg/server/fsm.go b/pkg/server/fsm.go index 073cd88f..f2640642 100644 --- a/pkg/server/fsm.go +++ b/pkg/server/fsm.go @@ -431,7 +431,7 @@ func (fsm *FSM) connectLoop() error { log.WithFields(log.Fields{ "Topic": "Peer", "Key": fsm.pConf.State.NeighborAddress, - }).Warn("failed to resolve local address: %s", err) + }).Warnf("failed to resolve local address: %s", err) return } var conn net.Conn |