aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2014-12-16 05:33:18 +0800
committerFelix Lange <fjl@twurst.com>2014-12-16 05:36:59 +0800
commitaa3b91b8026c665ee53f768f8b94c3abe1713bf6 (patch)
tree89fd556690a486e6a95ea11330bea556ef8eb518
parentb55fabc7be4debff147b0598eea39f9d16cfa108 (diff)
downloadgo-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar.gz
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar.bz2
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar.lz
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar.xz
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.tar.zst
go-tangerine-aa3b91b8026c665ee53f768f8b94c3abe1713bf6.zip
p2p: fix call to Server.removePeer (might help with #209)
-rw-r--r--p2p/server.go9
1 files changed, 2 insertions, 7 deletions
diff --git a/p2p/server.go b/p2p/server.go
index 9353e12ea..326781234 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -246,12 +246,7 @@ func (srv *Server) Stop() {
func (srv *Server) discLoop() {
for peer := range srv.peerDisconnect {
- // peer has just disconnected. free up its slot.
- srvlog.Infof("%v is gone", peer)
- srv.peerSlots <- peer.slot
- srv.lock.Lock()
- srv.peers[peer.slot] = nil
- srv.lock.Unlock()
+ srv.removePeer(peer)
}
}
@@ -384,7 +379,7 @@ func (srv *Server) addPeer(conn net.Conn, desc *peerAddr, slot int) *Peer {
func (srv *Server) removePeer(peer *Peer) {
srv.lock.Lock()
defer srv.lock.Unlock()
- srvlog.Debugf("Removing peer %v %v (slot %v)\n", peer, peer.slot)
+ srvlog.Debugf("Removing %v (slot %v)\n", peer, peer.slot)
if srv.peers[peer.slot] != peer {
srvlog.Warnln("Invalid peer to remove:", peer)
return