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

print RLIMIT_NOFILE

Browse source 
always close cymysql objects
This commit is contained in:
破娃酱 2016-11-02 19:06:54 +08:00
parent 9533044bd8
commit ac58020595
2 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
db_transfer.py
View file

@ -301,10 +301,20 @@ class DbTransfer(TransferBase):
user=self.cfg["user"], passwd=self.cfg["password"], user=self.cfg["user"], passwd=self.cfg["password"],
db=self.cfg["db"], charset='utf8') db=self.cfg["db"], charset='utf8')
cur = conn.cursor() try:
cur.execute(query_sql) cur = conn.cursor()
cur.close() try:
conn.commit() cur.execute(query_sql)
except Exception as e:
logging.error(e)
update_transfer = {}
cur.close()
conn.commit()
except Exception as e:
logging.error(e)
update_transfer = {}
conn.close() conn.close()
return update_transfer return update_transfer
@ -321,8 +331,13 @@ class DbTransfer(TransferBase):
user=self.cfg["user"], passwd=self.cfg["password"], user=self.cfg["user"], passwd=self.cfg["password"],
db=self.cfg["db"], charset='utf8') db=self.cfg["db"], charset='utf8')
rows = self.pull_db_users(conn) try:
rows = self.pull_db_users(conn)
except Exception as e:
logging.error(e)
rows = []
conn.close() conn.close()
if not rows: if not rows:
logging.warn('no user in db') logging.warn('no user in db')
return rows return rows
@ -414,19 +429,28 @@ class Dbv3Transfer(DbTransfer):
' END, t = ' + str(int(last_time)) + \ ' END, t = ' + str(int(last_time)) + \
' WHERE port IN (%s)' % query_sub_in ' WHERE port IN (%s)' % query_sub_in
cur = conn.cursor() cur = conn.cursor()
cur.execute(query_sql) try:
cur.execute(query_sql)
except Exception as e:
logging.error(e)
cur.close() cur.close()
try: try:
cur = conn.cursor() cur = conn.cursor()
cur.execute("INSERT INTO `ss_node_online_log` (`id`, `node_id`, `online_user`, `log_time`) VALUES (NULL, '" + \ try:
cur.execute("INSERT INTO `ss_node_online_log` (`id`, `node_id`, `online_user`, `log_time`) VALUES (NULL, '" + \
str(self.cfg["node_id"]) + "', '" + str(alive_user_count) + "', unix_timestamp()); ") str(self.cfg["node_id"]) + "', '" + str(alive_user_count) + "', unix_timestamp()); ")
except Exception as e:
logging.error(e)
cur.close() cur.close()
cur = conn.cursor() cur = conn.cursor()
cur.execute("INSERT INTO `ss_node_info_log` (`id`, `node_id`, `uptime`, `load`, `log_time`) VALUES (NULL, '" + \ try:
cur.execute("INSERT INTO `ss_node_info_log` (`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:
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 `ss_node_info_log` in db')
@ -444,8 +468,12 @@ class Dbv3Transfer(DbTransfer):
cur = conn.cursor() cur = conn.cursor()
node_info_keys = ['traffic_rate'] node_info_keys = ['traffic_rate']
cur.execute("SELECT " + ','.join(node_info_keys) +" FROM ss_node where `id`='" + str(self.cfg["node_id"]) + "'") try:
nodeinfo = cur.fetchone() cur.execute("SELECT " + ','.join(node_info_keys) +" FROM ss_node where `id`='" + str(self.cfg["node_id"]) + "'")
nodeinfo = cur.fetchone()
except Exception as e:
logging.error(e)
nodeinfo = None
if nodeinfo == None: if nodeinfo == None:
rows = [] rows = []
@ -461,13 +489,16 @@ class Dbv3Transfer(DbTransfer):
self.cfg['transfer_mul'] = float(node_info_dict['traffic_rate']) self.cfg['transfer_mul'] = float(node_info_dict['traffic_rate'])
cur = conn.cursor() cur = conn.cursor()
cur.execute("SELECT " + ','.join(keys) + " FROM user") try:
rows = [] cur.execute("SELECT " + ','.join(keys) + " FROM user")
for r in cur.fetchall(): rows = []
d = {} for r in cur.fetchall():
for column in range(len(keys)): d = {}
d[keys[column]] = r[column] for column in range(len(keys)):
rows.append(d) d[keys[column]] = r[column]
rows.append(d)
except Exception as e:
logging.error(e)
cur.close() cur.close()
return rows return rows

3
shadowsocks/server.py
View file

@ -41,6 +41,9 @@ def main():
daemon.daemon_exec(config) daemon.daemon_exec(config)
import resource
logging.info('current process RLIMIT_NOFILE resource: soft %d hard %d' % resource.getrlimit(resource.RLIMIT_NOFILE))
if config['port_password']: if config['port_password']:
pass pass
else: else: