From 4fe67652ff1e10839096dcff81d2588cfbca7fb5 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Sun, 14 May 2017 00:24:58 +0200 Subject: [PATCH] move SetLogger down --- p2p/switch.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/p2p/switch.go b/p2p/switch.go index ec157aca..5ccdc114 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -321,11 +321,11 @@ func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) (*Peer, sw.Logger.Info("Dialing peer", "address", addr) peer, err := newOutboundPeerWithConfig(addr, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, sw.peerConfig) - peer.SetLogger(sw.Logger.With("peer", addr)) if err != nil { sw.Logger.Error("Failed to dial peer", "address", addr, "error", err) return nil, err } + peer.SetLogger(sw.Logger.With("peer", addr)) if persistent { peer.makePersistent() } @@ -548,11 +548,11 @@ func makeSwitch(cfg *cfg.P2PConfig, i int, network, version string, initSwitch f func (sw *Switch) addPeerWithConnection(conn net.Conn) error { peer, err := newInboundPeer(conn, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey) - peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) if err != nil { conn.Close() return err } + peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) if err = sw.AddPeer(peer); err != nil { conn.Close() return err @@ -563,11 +563,11 @@ func (sw *Switch) addPeerWithConnection(conn net.Conn) error { func (sw *Switch) addPeerWithConnectionAndConfig(conn net.Conn, config *PeerConfig) error { peer, err := newInboundPeerWithConfig(conn, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, config) - peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) if err != nil { conn.Close() return err } + peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) if err = sw.AddPeer(peer); err != nil { conn.Close() return err