This commit is contained in:
BreakWa11 2016-07-20 11:13:56 +08:00
parent 794121f111
commit 7bfafa7f3d

View file

@ -224,8 +224,8 @@ class DbTransfer(object):
self.event.wait(eventloop.TIMEOUT_PRECISION + eventloop.TIMEOUT_PRECISION / 2)
for port in new_servers.keys():
passwd, cfg = new_servers[port]
protocol = cfb.get('protocol', ServerPool.get_instance().config.get('protocol', 'origin'))
obfs = cfb.get('obfs', ServerPool.get_instance().config.get('obfs', 'plain'))
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)