兼容py3,修正语法错误,加载libcrypto模块失败时显示详细错误。
修正语法错误:` except Exception, e: ` 是旧版本的语法,py2.6之后的版本已不再使用此语法。 加载libcrypto模块失败时显示详细错误。
This commit is contained in:
parent
5a5b897578
commit
b6961974ba
3 changed files with 11 additions and 11 deletions
|
@ -79,7 +79,7 @@ class DbTransfer(object):
|
||||||
try:
|
try:
|
||||||
import switchrule
|
import switchrule
|
||||||
keys = switchrule.getKeys()
|
keys = switchrule.getKeys()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
keys = ['port', 'u', 'd', 'transfer_enable', 'passwd', 'enable' ]
|
keys = ['port', 'u', 'd', 'transfer_enable', 'passwd', 'enable' ]
|
||||||
conn = cymysql.connect(host=Config.MYSQL_HOST, port=Config.MYSQL_PORT, user=Config.MYSQL_USER,
|
conn = cymysql.connect(host=Config.MYSQL_HOST, port=Config.MYSQL_PORT, user=Config.MYSQL_USER,
|
||||||
passwd=Config.MYSQL_PASS, db=Config.MYSQL_DB, charset='utf8')
|
passwd=Config.MYSQL_PASS, db=Config.MYSQL_DB, charset='utf8')
|
||||||
|
@ -102,13 +102,13 @@ class DbTransfer(object):
|
||||||
#需要动态载入switchrule,以便实时修改规则
|
#需要动态载入switchrule,以便实时修改规则
|
||||||
try:
|
try:
|
||||||
import switchrule
|
import switchrule
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
logging.error('load switchrule.py fail')
|
logging.error('load switchrule.py fail')
|
||||||
cur_servers = {}
|
cur_servers = {}
|
||||||
for row in rows:
|
for row in rows:
|
||||||
try:
|
try:
|
||||||
allow = switchrule.isTurnOn(row) and row['enable'] == 1 and row['u'] + row['d'] < row['transfer_enable']
|
allow = switchrule.isTurnOn(row) and row['enable'] == 1 and row['u'] + row['d'] < row['transfer_enable']
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
allow = False
|
allow = False
|
||||||
|
|
||||||
port = row['port']
|
port = row['port']
|
||||||
|
|
|
@ -120,7 +120,7 @@ class ServerPool(object):
|
||||||
|
|
||||||
if a_config['server_ipv6'] == "::":
|
if a_config['server_ipv6'] == "::":
|
||||||
ipv6_ok = True
|
ipv6_ok = True
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
logging.warn("IPV6 %s " % (e,))
|
logging.warn("IPV6 %s " % (e,))
|
||||||
|
|
||||||
if 'server' in self.config:
|
if 'server' in self.config:
|
||||||
|
@ -142,7 +142,7 @@ class ServerPool(object):
|
||||||
udp_server.add_to_loop(self.loop)
|
udp_server.add_to_loop(self.loop)
|
||||||
self.udp_servers_pool.update({port: udp_server})
|
self.udp_servers_pool.update({port: udp_server})
|
||||||
|
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
if not ipv6_ok:
|
if not ipv6_ok:
|
||||||
logging.warn("IPV4 %s " % (e,))
|
logging.warn("IPV4 %s " % (e,))
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ class ServerPool(object):
|
||||||
udpsock = socket(AF_INET, SOCK_DGRAM)
|
udpsock = socket(AF_INET, SOCK_DGRAM)
|
||||||
udpsock.sendto('%s:%s:0:0' % (Config.MANAGE_PASS, port), (Config.MANAGE_BIND_IP, Config.MANAGE_PORT))
|
udpsock.sendto('%s:%s:0:0' % (Config.MANAGE_PASS, port), (Config.MANAGE_BIND_IP, Config.MANAGE_PORT))
|
||||||
udpsock.close()
|
udpsock.close()
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
logging.warn(e)
|
logging.warn(e)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
@ -169,12 +169,12 @@ class ServerPool(object):
|
||||||
try:
|
try:
|
||||||
self.tcp_servers_pool[port].close(False)
|
self.tcp_servers_pool[port].close(False)
|
||||||
del self.tcp_servers_pool[port]
|
del self.tcp_servers_pool[port]
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
logging.warn(e)
|
logging.warn(e)
|
||||||
try:
|
try:
|
||||||
self.udp_servers_pool[port].close(False)
|
self.udp_servers_pool[port].close(False)
|
||||||
del self.udp_servers_pool[port]
|
del self.udp_servers_pool[port]
|
||||||
except Exception, e:
|
except Exception as e:
|
||||||
logging.warn(e)
|
logging.warn(e)
|
||||||
|
|
||||||
if 'server_ipv6' in self.config:
|
if 'server_ipv6' in self.config:
|
||||||
|
@ -185,12 +185,12 @@ class ServerPool(object):
|
||||||
try:
|
try:
|
||||||
self.tcp_ipv6_servers_pool[port].close(False)
|
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 as e:
|
||||||
logging.warn(e)
|
logging.warn(e)
|
||||||
try:
|
try:
|
||||||
self.udp_ipv6_servers_pool[port].close(False)
|
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 as e:
|
||||||
logging.warn(e)
|
logging.warn(e)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -88,7 +88,7 @@ def find_library(possible_lib_names, search_symbol, library_name):
|
||||||
logging.warn('can\'t find symbol %s in %s', search_symbol,
|
logging.warn('can\'t find symbol %s in %s', search_symbol,
|
||||||
path)
|
path)
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
print(e)
|
logging.error(e)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue