From 09378d3931f1fb55da37d3626546109361c75ee7 Mon Sep 17 00:00:00 2001
From: jinxing <jinxing@jinxing.me>
Date: Tue, 15 Apr 2014 21:21:23 +0800
Subject: [PATCH] no

---
 .gitignore                  | 3 +++
 config.json                 | 6 +++---
 shadowsocks/ioloop.py       | 5 +++--
 shadowsocks/server-epoll.py | 3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f24cd99..e0aa560 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#
+config.json
diff --git a/config.json b/config.json
index 7adf48d..edf6f73 100644
--- a/config.json
+++ b/config.json
@@ -1,8 +1,8 @@
 {
-    "server":"localhost",
-    "server_port":8388,
+    "server":"asia.jinxing.me",
+    "server_port":28388,
     "local_port":1080,
-    "password":"barfoo!",
+    "password":"x980barfoo!",
     "timeout":600,
     "method":"table"
 }
diff --git a/shadowsocks/ioloop.py b/shadowsocks/ioloop.py
index b72e999..7ca2828 100644
--- a/shadowsocks/ioloop.py
+++ b/shadowsocks/ioloop.py
@@ -12,6 +12,7 @@ import select
 import logging
 import socket
 import errno
+import binascii
 
 try:
     from cStringIO import StringIO
@@ -201,8 +202,8 @@ class IOHandler(BaseHandler):
         self._ios.real_write()
 
     def handle_error(self, events):
-        logging.error("handle_error fd(%s)", self._fd)
-        raise IOLoopError("io error: %x" % events)
+        logging.error("handle_error fd(%s), events: %s", self._fd, binascii.b2a_hex(events))
+        self._ios.close()
 
 
 class SimpleCopyFileHandler(IOHandler):
diff --git a/shadowsocks/server-epoll.py b/shadowsocks/server-epoll.py
index 270e659..05f7857 100644
--- a/shadowsocks/server-epoll.py
+++ b/shadowsocks/server-epoll.py
@@ -204,14 +204,13 @@ class LeftTunnelHandler(BaseTunnelHandler):
         try:
             logging.info('connecting to remote %s:%d', addr, port)
             _start_time = time.time()
-            # remote_socket = socket.create_connection((addr, port), G_CONFIG['timeout'])
             remote_socket = socket.socket()
             remote_socket.connect((addr, port))
             remote_socket.setblocking(0)
             logging.info('cost time: %d', time.time()-_start_time)
         except socket.error, e:
             # Connection refused
-            logging.warn("connect_to_remote(): %s, args: %r", e, e.args)
+            logging.warn(e)
             return None
 
         remote_ts = TunnelStream(remote_socket)