fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-30 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

move SetLogger down

Browse Source
This commit is contained in:
Anton Kaliaev 2017-05-14 00:24:58 +02:00
parent c5bccc5474
commit 4fe67652ff
No known key found for this signature in database
GPG Key ID: 7B6881D965918214
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/switch.go
View File

@ -321,11 +321,11 @@ func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) (*Peer,
sw.Logger.Info("Dialing peer", "address", addr) sw.Logger.Info("Dialing peer", "address", addr)
peer, err := newOutboundPeerWithConfig(addr, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, sw.peerConfig) peer, err := newOutboundPeerWithConfig(addr, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, sw.peerConfig)
peer.SetLogger(sw.Logger.With("peer", addr))
if err != nil { if err != nil {
sw.Logger.Error("Failed to dial peer", "address", addr, "error", err) sw.Logger.Error("Failed to dial peer", "address", addr, "error", err)
return nil, err return nil, err
} }
peer.SetLogger(sw.Logger.With("peer", addr))
if persistent { if persistent {
peer.makePersistent() 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 { func (sw *Switch) addPeerWithConnection(conn net.Conn) error {
peer, err := newInboundPeer(conn, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey) peer, err := newInboundPeer(conn, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey)
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err != nil { if err != nil {
conn.Close() conn.Close()
return err return err
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.AddPeer(peer); err != nil { if err = sw.AddPeer(peer); err != nil {
conn.Close() conn.Close()
return err return err
@ -563,11 +563,11 @@ func (sw *Switch) addPeerWithConnection(conn net.Conn) error {
func (sw *Switch) addPeerWithConnectionAndConfig(conn net.Conn, config *PeerConfig) 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, err := newInboundPeerWithConfig(conn, sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, config)
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err != nil { if err != nil {
conn.Close() conn.Close()
return err return err
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.AddPeer(peer); err != nil { if err = sw.AddPeer(peer); err != nil {
conn.Close() conn.Close()
return err return err