we don't need to handle errors here since they are already handled in

worker
This commit is contained in:
Benoit Chesneau 2009-12-14 01:56:36 +01:00
parent 753f3bcf1a
commit 8d53f458db

View File

@ -25,38 +25,17 @@ class IOStream(object):
def __init__(self, sock): def __init__(self, sock):
self.sock = sock self.sock = sock
self.buf = "" self.buf = ""
def recv(self, buffer_size): def recv(self, buffer_size):
try: data = self.sock.recv(buffer_size)
data = self.sock.recv(buffer_size) if not data:
if not data: # we should handle close here
# we should handle close here return ''
return '' return data
return data
except socket.error, e:
if e.args[0] in (errno.ECONNRESET, errno.ENOTCONN,
errno.ESHUTDOWN, errno.ECONNABORTED):
# we should handle close here
return ''
raise
def send(self, data): def send(self, data):
try: return self.sock.send(data)
rst = self.sock.send(data)
return rst
except socket.error, e:
if e.args[0] == EWOULDBLOCK:
return 0
elif e.args[0] in (errno.ECONNRESET, errno.ENOTCONN,
errno.ESHUTDOWN, errno.ECONNABORTED):
# we should handle close here
return 0
else:
raise
def read_until(self, delimiter): def read_until(self, delimiter):
while True: while True: