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

sql bug fix

Browse source
This commit is contained in:
mengskysama 2014-10-08 13:56:38 +08:00
parent 7b0e01722a
commit 5f8ca072d7
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
shadowsocks/server_pool.py
View file

@ -160,19 +160,20 @@ class ServerPool(object):
except Exception, e: except Exception, e:
logging.warn(e) logging.warn(e)
if port not in self.tcp_ipv6_servers_pool: if 'server_ipv6' in self.config:
logging.info("stopped server at %s:%d already stop" % (self.config['server_ipv6'], port)) if port not in self.tcp_ipv6_servers_pool:
else: logging.info("stopped server at %s:%d already stop" % (self.config['server_ipv6'], port))
logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port)) else:
try: logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port))
self.tcp_ipv6_servers_pool[port].destroy() try:
del self.tcp_ipv6_servers_pool[port] self.tcp_ipv6_servers_pool[port].destroy()
#self.udp_ipv6_servers_pool[port].destroy() del self.tcp_ipv6_servers_pool[port]
#del self.udp_ipv6_servers_pool[port] #self.udp_ipv6_servers_pool[port].destroy()
except Exception, e: #del self.udp_ipv6_servers_pool[port]
logging.warn(e) except Exception, e:
logging.warn(e)
return True return True
def get_server_transfer(self, port): def get_server_transfer(self, port):
port = int(port) port = int(port)

4
shadowsocks/shadowsocks.sql
View file

@ -6,8 +6,8 @@ CREATE TABLE `user` (
`pass` varchar(16) NOT NULL, `pass` varchar(16) NOT NULL,
`passwd` varchar(16) NOT NULL, `passwd` varchar(16) NOT NULL,
`t` int(11) NOT NULL DEFAULT '0', `t` int(11) NOT NULL DEFAULT '0',
`u` int(20) NOT NULL, `u` bigint(20) NOT NULL,
`d` int(20) NOT NULL, `d` bigint(20) NOT NULL,
`transfer_enable` bigint(20) NOT NULL, `transfer_enable` bigint(20) NOT NULL,
`port` int(11) NOT NULL, `port` int(11) NOT NULL,
`switch` tinyint(4) NOT NULL DEFAULT '1', `switch` tinyint(4) NOT NULL DEFAULT '1',