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

remove mgr

Browse source
This commit is contained in:
BreakWa11 2016-05-17 18:00:17 +08:00
parent d47b0d47ea
commit b8cf491212
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server_pool.py
View file

@ -55,7 +55,7 @@ class ServerPool(object):
if not self.config.get('dns_ipv6', False): if not self.config.get('dns_ipv6', False):
asyncdns.IPV6_CONNECTION_SUPPORT = False asyncdns.IPV6_CONNECTION_SUPPORT = False
self.mgr = asyncmgr.ServerMgr() self.mgr = None #asyncmgr.ServerMgr()
self.tcp_servers_pool = {} self.tcp_servers_pool = {}
self.tcp_ipv6_servers_pool = {} self.tcp_ipv6_servers_pool = {}
@ -78,7 +78,8 @@ class ServerPool(object):
@staticmethod @staticmethod
def _loop(loop, dns_resolver, mgr): def _loop(loop, dns_resolver, mgr):
try: try:
mgr.add_to_loop(loop) if mgr is not None:
mgr.add_to_loop(loop)
dns_resolver.add_to_loop(loop) dns_resolver.add_to_loop(loop)
loop.run() loop.run()
except (KeyboardInterrupt, IOError, OSError) as e: except (KeyboardInterrupt, IOError, OSError) as e:
@ -211,7 +212,7 @@ class ServerPool(object):
except Exception as e: except Exception as e:
logging.warn(e) logging.warn(e)
return True return True
def get_server_transfer(self, port): def get_server_transfer(self, port):
port = int(port) port = int(port)