oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new documents with examples, raise exception on connection error, close connection if no handshake for 60 sec, log unhandled exceptions, calc object size using guppy, typo fix

Browse source
This commit is contained in:
HelloZeroNet 2015-03-11 01:12:53 +01:00
parent 44d961aefa
commit 5b5c8acdcb
10 changed files with 75 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Peer/Peer.py
View file

@ -40,8 +40,7 @@ class Peer:
try:
self.connection = self.connection_server.getConnection(self.ip, self.port)
except Exception, err:
self.log.debug("Getting connection error: %s" % Debug.formatException(err))
self.onConnectionError()
self.log.debug("Getting connection error: %s (connection_error: %s, hash_failed: %s)" % (Debug.formatException(err), self.connection_error, self.hash_failed))
def __str__(self):
return "Peer %-12s" % self.ip
@ -58,7 +57,9 @@ class Peer:
def request(self, cmd, params = {}):
if not self.connection or self.connection.closed:
self.connect()
if not self.connection: return None # Connection failed
if not self.connection:
self.onConnectionError()
return None # Connection failed
#if cmd != "ping" and self.last_response and time.time() - self.last_response > 20*60: # If last response if older than 20 minute, ping first to see if still alive
# if not self.ping(): return None