From 1956e79494ad8484bae58feb73b63922fe7809cf Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Wed, 28 Oct 2009 02:40:02 +0200 Subject: Net-RPC: armor the thread, provide stats and inf. timeout. This fixes near-persistent connections where the client will take long to respond. It is better to keep the connection open, than to launch more threads and use ports. bzr revid: p_christ@hol.gr-20091028004002-8y5iprfizzsktlkv --- bin/tiny_socket.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'bin/tiny_socket.py') diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py index 9a4376891b7..387765da14b 100644 --- a/bin/tiny_socket.py +++ b/bin/tiny_socket.py @@ -33,11 +33,13 @@ class Myexception(Exception): class mysocket: def __init__(self, sock=None): if sock is None: - self.sock = socket.socket( - socket.AF_INET, socket.SOCK_STREAM) + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) else: self.sock = sock - self.sock.settimeout(120) + # self.sock.settimeout(120) + # prepare this socket for long operations: it may block for infinite + # time, but should exit as soon as the net is down + self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) def connect(self, host, port=False): if not port: protocol, buf = host.split('//') @@ -61,8 +63,8 @@ class mysocket: buf='' while len(buf) < 8: chunk = self.sock.recv(8 - len(buf)) - if chunk == '': - raise RuntimeError, "socket connection broken" + if not chunk: + raise socket.timeout buf += chunk size = int(buf) buf = self.sock.recv(1) @@ -73,8 +75,8 @@ class mysocket: msg = '' while len(msg) < size: chunk = self.sock.recv(size-len(msg)) - if chunk == '': - raise RuntimeError, "socket connection broken" + if not chunk: + raise socket.timeout msg = msg + chunk msgio = cStringIO.StringIO(msg) unpickler = cPickle.Unpickler(msgio) -- cgit v1.2.3