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

close #122

Browse source
This commit is contained in:
clowwindy 2014-06-18 12:59:00 +08:00
parent 08e351a55d
commit a0e1a9f1b0
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
shadowsocks/tcprelay.py
View file

@ -157,7 +157,8 @@ class TCPRelayHandler(object):
uncomplete = True uncomplete = True
else: else:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
self.destroy() self.destroy()
return False return False
if uncomplete: if uncomplete:
@ -208,7 +209,8 @@ class TCPRelayHandler(object):
self.destroy() self.destroy()
else: else:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
self.destroy() self.destroy()
def _handle_stage_hello(self, data): def _handle_stage_hello(self, data):
@ -263,7 +265,8 @@ class TCPRelayHandler(object):
self._handle_dns_resolved) self._handle_dns_resolved)
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
# TODO use logging when debug completed # TODO use logging when debug completed
self.destroy() self.destroy()
@ -317,7 +320,8 @@ class TCPRelayHandler(object):
return return
except (OSError, IOError) as e: except (OSError, IOError) as e:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
self.destroy() self.destroy()
def _on_local_read(self): def _on_local_read(self):
@ -375,7 +379,8 @@ class TCPRelayHandler(object):
self._write_to_sock(data, self._local_sock) self._write_to_sock(data, self._local_sock)
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
# TODO use logging when debug completed # TODO use logging when debug completed
self.destroy() self.destroy()
@ -593,7 +598,8 @@ class TCPRelay(object):
continue continue
else: else:
logging.error(e) logging.error(e)
traceback.print_exc() if self._config['verbose']:
traceback.print_exc()
else: else:
if sock: if sock:
handler = self._fd_to_handlers.get(fd, None) handler = self._fd_to_handlers.get(fd, None)