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

remove 'plan' & 'switch'

Browse source
This commit is contained in:
breakwa11 2015-07-01 10:50:28 +08:00
parent 3af426b13b
commit a142b957a7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
db_transfer.py
View file

@ -76,7 +76,7 @@ class DbTransfer(object):
@staticmethod @staticmethod
def pull_db_all_user(): def pull_db_all_user():
#数据库所有用户信息 #数据库所有用户信息
keys = ['port', 'u', 'd', 'transfer_enable', 'passwd', 'switch', 'enable', 'plan' ] 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')
cur = conn.cursor() cur = conn.cursor()
@ -96,10 +96,13 @@ class DbTransfer(object):
#停止超流量的服务 #停止超流量的服务
#启动没超流量的服务 #启动没超流量的服务
#需要动态载入switchrule，以便实时修改规则 #需要动态载入switchrule，以便实时修改规则
try:
import switchrule
except Exception, e:
logging.error('load switchrule.py fail')
cur_servers = {} cur_servers = {}
for row in rows: for row in rows:
try: try:
import switchrule
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, e:
allow = False allow = False