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

add "glzjinmod" interface

Browse source
This commit is contained in:
破娃酱 2017-02-02 19:50:55 +08:00
parent 390be3bf8d
commit 31aaea603a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apiconfig.py
View file

@ -1,5 +1,5 @@
# Config # Config
API_INTERFACE = 'sspanelv2' #mudbjson, sspanelv2, sspanelv3, sspanelv3ssr, muapiv2(not support) API_INTERFACE = 'sspanelv2' #mudbjson, sspanelv2, sspanelv3, sspanelv3ssr, glzjinmod, muapiv2(not support)
UPDATE_TIME = 60 UPDATE_TIME = 60
SERVER_PUB_ADDR = '127.0.0.1' # mujson_mgr need this to generate ssr link SERVER_PUB_ADDR = '127.0.0.1' # mujson_mgr need this to generate ssr link

7
db_transfer.py
View file

@ -391,8 +391,11 @@ class Dbv3Transfer(DbTransfer):
def __init__(self): def __init__(self):
super(Dbv3Transfer, self).__init__() super(Dbv3Transfer, self).__init__()
self.key_list += ['id', 'method'] self.key_list += ['id', 'method']
self.ss_node_info_name = 'ss_node_info_log'
if get_config().API_INTERFACE == 'sspanelv3ssr': if get_config().API_INTERFACE == 'sspanelv3ssr':
self.key_list += ['obfs', 'protocol'] self.key_list += ['obfs', 'protocol']
if get_config().API_INTERFACE == 'glzjinmod':
self.ss_node_info_name = 'ss_node_info'
self.start_time = time.time() self.start_time = time.time()
def update_all_user(self, dt_transfer): def update_all_user(self, dt_transfer):
@ -473,14 +476,14 @@ class Dbv3Transfer(DbTransfer):
cur = conn.cursor() cur = conn.cursor()
try: try:
cur.execute("INSERT INTO `ss_node_info_log` (`id`, `node_id`, `uptime`, `load`, `log_time`) VALUES (NULL, '" + \ cur.execute("INSERT INTO `" + self.ss_node_info_name + "` (`id`, `node_id`, `uptime`, `load`, `log_time`) VALUES (NULL, '" + \
str(self.cfg["node_id"]) + "', '" + str(self.uptime()) + "', '" + \ str(self.cfg["node_id"]) + "', '" + str(self.uptime()) + "', '" + \
str(self.load()) + "', unix_timestamp()); ") str(self.load()) + "', unix_timestamp()); ")
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
cur.close() cur.close()
except: except:
logging.warn('no `ss_node_online_log` or `ss_node_info_log` in db') logging.warn('no `ss_node_online_log` or `" + self.ss_node_info_name + "` in db')
conn.close() conn.close()
return update_transfer return update_transfer