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

show port details

Browse source
This commit is contained in:
BreakWa11 2016-07-19 21:29:07 +08:00
parent 32957158b9
commit 794121f111
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db_transfer.py
View file

@ -205,7 +205,9 @@ class DbTransfer(object):
elif allow and ServerPool.get_instance().server_run_status(port) is False: elif allow and ServerPool.get_instance().server_run_status(port) is False:
#new_servers[port] = passwd #new_servers[port] = passwd
logging.info('db start server at port [%s] pass [%s]' % (port, passwd)) protocol = cfg.get('protocol', ServerPool.get_instance().config.get('protocol', 'origin'))
obfs = cfg.get('obfs', ServerPool.get_instance().config.get('obfs', 'plain'))
logging.info('db start server at port [%s] pass [%s] protocol [%s] obfs [%s]' % (port, passwd, protocol, obfs))
ServerPool.get_instance().new_server(port, cfg) ServerPool.get_instance().new_server(port, cfg)
for row in last_rows: for row in last_rows:
@ -222,7 +224,9 @@ class DbTransfer(object):
self.event.wait(eventloop.TIMEOUT_PRECISION + eventloop.TIMEOUT_PRECISION / 2) self.event.wait(eventloop.TIMEOUT_PRECISION + eventloop.TIMEOUT_PRECISION / 2)
for port in new_servers.keys(): for port in new_servers.keys():
passwd, cfg = new_servers[port] passwd, cfg = new_servers[port]
logging.info('db start server at port [%s] pass [%s]' % (port, passwd)) protocol = cfb.get('protocol', ServerPool.get_instance().config.get('protocol', 'origin'))
obfs = cfb.get('obfs', ServerPool.get_instance().config.get('obfs', 'plain'))
logging.info('db start server at port [%s] pass [%s] protocol [%s] obfs [%s]' % (port, passwd, protocol, obfs))
ServerPool.get_instance().new_server(port, cfg) ServerPool.get_instance().new_server(port, cfg)
@staticmethod @staticmethod