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

fix closing relays

Browse source
This commit is contained in:
breakwa11 2015-08-12 12:32:20 +08:00
parent 661fbbfb8b
commit b32cc8f703
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
db_transfer.py
View file

@ -118,12 +118,12 @@ class DbTransfer(object):
if ServerPool.get_instance().server_is_run(port) > 0: if ServerPool.get_instance().server_is_run(port) > 0:
if not allow: if not allow:
logging.info('db stop server at port [%s]' % (port,)) logging.info('db stop server at port [%s]' % (port,))
ServerPool.get_instance().del_server(port) ServerPool.get_instance().cb_del_server(port)
elif (port in ServerPool.get_instance().tcp_servers_pool and ServerPool.get_instance().tcp_servers_pool[port]._config['password'] != passwd) \ elif (port in ServerPool.get_instance().tcp_servers_pool and ServerPool.get_instance().tcp_servers_pool[port]._config['password'] != passwd) \
or (port in ServerPool.get_instance().tcp_ipv6_servers_pool and ServerPool.get_instance().tcp_ipv6_servers_pool[port]._config['password'] != passwd): or (port in ServerPool.get_instance().tcp_ipv6_servers_pool and ServerPool.get_instance().tcp_ipv6_servers_pool[port]._config['password'] != passwd):
#password changed #password changed
logging.info('db stop server at port [%s] reason: password changed' % (port,)) logging.info('db stop server at port [%s] reason: password changed' % (port,))
ServerPool.get_instance().del_server(port) ServerPool.get_instance().cb_del_server(port)
elif allow and ServerPool.get_instance().server_run_status(port) is False: elif allow and ServerPool.get_instance().server_run_status(port) is False:
logging.info('db start server at port [%s] pass [%s]' % (port, passwd)) logging.info('db start server at port [%s] pass [%s]' % (port, passwd))
@ -134,7 +134,7 @@ class DbTransfer(object):
pass pass
else: else:
logging.info('db stop server at port [%s] reason: port not exist' % (row['port'])) logging.info('db stop server at port [%s] reason: port not exist' % (row['port']))
ServerPool.get_instance().del_server(row['port']) ServerPool.get_instance().cb_del_server(row['port'])
@staticmethod @staticmethod
def thread_db(): def thread_db():

8
server_pool.py
View file

@ -167,12 +167,12 @@ class ServerPool(object):
else: else:
logging.info("stopped server at %s:%d" % (self.config['server'], port)) logging.info("stopped server at %s:%d" % (self.config['server'], port))
try: try:
self.tcp_servers_pool[port].close(True) self.tcp_servers_pool[port].close(False)
del self.tcp_servers_pool[port] del self.tcp_servers_pool[port]
except Exception, e: except Exception, e:
logging.warn(e) logging.warn(e)
try: try:
self.udp_servers_pool[port].close(True) self.udp_servers_pool[port].close(False)
del self.udp_servers_pool[port] del self.udp_servers_pool[port]
except Exception, e: except Exception, e:
logging.warn(e) logging.warn(e)
@ -183,12 +183,12 @@ class ServerPool(object):
else: else:
logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port)) logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port))
try: try:
self.tcp_ipv6_servers_pool[port].close(True) self.tcp_ipv6_servers_pool[port].close(False)
del self.tcp_ipv6_servers_pool[port] del self.tcp_ipv6_servers_pool[port]
except Exception, e: except Exception, e:
logging.warn(e) logging.warn(e)
try: try:
self.udp_ipv6_servers_pool[port].close(True) self.udp_ipv6_servers_pool[port].close(False)
del self.udp_ipv6_servers_pool[port] del self.udp_ipv6_servers_pool[port]
except Exception, e: except Exception, e:
logging.warn(e) logging.warn(e)