vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

show exception peer name

Browse source
This commit is contained in:
BreakWa11 2016-05-23 17:44:01 +08:00
parent 2e65becc44
commit 8b35508b6f
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shadowsocks/eventloop.py
View file

@ -216,6 +216,11 @@ class EventLoop(object):
handler.handle_event(sock, fd, event) handler.handle_event(sock, fd, event)
except (OSError, IOError) as e: except (OSError, IOError) as e:
shell.print_exception(e) shell.print_exception(e)
try:
addr = sock.getpeername()[:2]
logging.error('exception peer name %s:%d' % (addr[0], addr[1]))
except:
pass
now = time.time() now = time.time()
if asap or now - self._last_time >= TIMEOUT_PRECISION: if asap or now - self._last_time >= TIMEOUT_PRECISION:
for callback in self._periodic_callbacks: for callback in self._periodic_callbacks:

3
shadowsocks/tcprelay.py
View file

@ -1008,9 +1008,6 @@ class TCPRelay(object):
if error_no in (errno.EAGAIN, errno.EINPROGRESS, if error_no in (errno.EAGAIN, errno.EINPROGRESS,
errno.EWOULDBLOCK): errno.EWOULDBLOCK):
return return
elif error_no == errno.ECONNRESET:
shell.print_exception(e)
logging.info("recv RST, ignore")
else: else:
shell.print_exception(e) shell.print_exception(e)
if self._config['verbose']: if self._config['verbose']: