Avoided to log a debug message error when the socket is normally closed.

This commit is contained in:
Sandro Munda 2012-11-01 11:36:52 +01:00
parent d444930494
commit 3a7569e3ea

View File

@ -2,6 +2,7 @@ import sys
import logging import logging
import struct import struct
import pickle import pickle
import socket
from threading import Thread, Event from threading import Thread, Event
from hashlib import sha1 from hashlib import sha1
@ -347,10 +348,14 @@ class Proxy(Thread):
# Wait any read available data on socket. Timeout # Wait any read available data on socket. Timeout
# after 5 secs. # after 5 secs.
ins, out, err = select([self.s, ], [], [], 5) ins, out, err = select([self.s, ], [], [], 5)
except socket.error as (errno, err):
# 9 means the socket is closed. It can be normal. Otherwise,
# log the error.
if errno != 9:
log.debug('Socket error: %s' % err)
break
except Exception as e: except Exception as e:
# There's an error with the socket (maybe the socket log.debug(e)
# has been closed and the file descriptor is bad).
log.debug('Socket error: %s' % e)
break break
for s in ins: for s in ins: