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

better way to stop a server

Browse source
This commit is contained in:
BreakWa11 2016-05-20 15:49:19 +08:00
parent 760a5308dd
commit 4e10ff9063
5 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
db_transfer.py
View file

@ -115,6 +115,7 @@ class DbTransfer(object):
except Exception as e:
logging.error('load switchrule.py fail')
cur_servers = {}
new_servers = {}
for row in rows:
try:
allow = switchrule.isTurnOn(row) and row['enable'] == 1 and row['u'] + row['d'] < row['transfer_enable']
@ -139,9 +140,10 @@ class DbTransfer(object):
#password changed
logging.info('db stop server at port [%s] reason: password changed' % (port,))
ServerPool.get_instance().cb_del_server(port)
ServerPool.get_instance().new_server(port, passwd)
new_servers[port] = passwd
elif allow and ServerPool.get_instance().server_run_status(port) is False:
#new_servers[port] = passwd
logging.info('db start server at port [%s] pass [%s]' % (port, passwd))
ServerPool.get_instance().new_server(port, passwd)
@ -152,6 +154,14 @@ class DbTransfer(object):
logging.info('db stop server at port [%s] reason: port not exist' % (row['port']))
ServerPool.get_instance().cb_del_server(row['port'])
if len(new_servers) > 0:
from shadowsocks import eventloop
DbTransfer.get_instance().event.wait(eventloop.TIMEOUT_PRECISION)
for port in new_servers.keys():
passwd = new_servers[port]
logging.info('db start server at port [%s] pass [%s]' % (port, passwd))
ServerPool.get_instance().new_server(port, passwd)
@staticmethod
def del_servers():
for port in ServerPool.get_instance().tcp_servers_pool.keys():