From 816592b67467fa435903f76b6dcd9c23a0b4783e Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Fri, 6 Jun 2014 22:57:57 +0800
Subject: [PATCH] add more log

---
 shadowsocks/eventloop.py |  4 ++++
 shadowsocks/server.py    |  2 ++
 shadowsocks/tcprelay.py  | 12 ++++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/shadowsocks/eventloop.py b/shadowsocks/eventloop.py
index c9de6ef..e8af800 100644
--- a/shadowsocks/eventloop.py
+++ b/shadowsocks/eventloop.py
@@ -202,6 +202,8 @@ class EventLoop(object):
                     continue
                 else:
                     logging.error(e)
+                    import traceback
+                    traceback.print_exc()
                     continue
             for handler in self._handlers:
                 # TODO when there are a lot of handlers
@@ -209,6 +211,8 @@ class EventLoop(object):
                     handler(events)
                 except (OSError, IOError) as e:
                     logging.error(e)
+                    import traceback
+                    traceback.print_exc()
 
 
 # from tornado
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index 2e35698..13c2452 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -69,6 +69,8 @@ def main():
             loop.run()
         except (KeyboardInterrupt, IOError, OSError) as e:
             logging.error(e)
+            import traceback
+            traceback.print_exc()
             os._exit(0)
 
     if int(config['workers']) > 1:
diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py
index 5f66962..64b65d2 100644
--- a/shadowsocks/tcprelay.py
+++ b/shadowsocks/tcprelay.py
@@ -26,6 +26,7 @@ import socket
 import errno
 import struct
 import logging
+import traceback
 import encrypt
 import eventloop
 from common import parse_header
@@ -152,6 +153,7 @@ class TCPRelayHandler(object):
                 uncomplete = True
             else:
                 logging.error(e)
+                traceback.print_exc()
                 self.destroy()
                 return False
         if uncomplete:
@@ -202,6 +204,7 @@ class TCPRelayHandler(object):
                     self.destroy()
                 else:
                     logging.error(e)
+                    traceback.print_exc()
                     self.destroy()
 
     def _handle_stage_hello(self, data):
@@ -277,8 +280,8 @@ class TCPRelayHandler(object):
                 self._stage = STAGE_REPLY
                 self._update_stream(STREAM_UP, WAIT_STATUS_READWRITING)
                 self._update_stream(STREAM_DOWN, WAIT_STATUS_READING)
-        except Exception:
-            import traceback
+        except Exception as e:
+            logging.error(e)
             traceback.print_exc()
             # TODO use logging when debug completed
             self.destroy()
@@ -336,8 +339,8 @@ class TCPRelayHandler(object):
             data = self._encryptor.encrypt(data)
         try:
             self._write_to_sock(data, self._local_sock)
-        except Exception:
-            import traceback
+        except Exception as e:
+            logging.error(e)
             traceback.print_exc()
             # TODO use logging when debug completed
             self.destroy()
@@ -540,6 +543,7 @@ class TCPRelay(object):
                         continue
                     else:
                         logging.error(e)
+                        traceback.print_exc()
             else:
                 if sock:
                     handler = self._fd_to_handlers.get(fd, None)