From 5f8ca072d7e91d11d5297d09441ed597603aa747 Mon Sep 17 00:00:00 2001 From: mengskysama Date: Wed, 8 Oct 2014 13:56:38 +0800 Subject: [PATCH] sql bug fix --- shadowsocks/server_pool.py | 25 +++++++++++++------------ shadowsocks/shadowsocks.sql | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/shadowsocks/server_pool.py b/shadowsocks/server_pool.py index ab22d56..d1d5353 100644 --- a/shadowsocks/server_pool.py +++ b/shadowsocks/server_pool.py @@ -160,19 +160,20 @@ class ServerPool(object): except Exception, e: logging.warn(e) - if port not in self.tcp_ipv6_servers_pool: - logging.info("stopped server at %s:%d already stop" % (self.config['server_ipv6'], port)) - else: - logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port)) - try: - self.tcp_ipv6_servers_pool[port].destroy() - del self.tcp_ipv6_servers_pool[port] - #self.udp_ipv6_servers_pool[port].destroy() - #del self.udp_ipv6_servers_pool[port] - except Exception, e: - logging.warn(e) + if 'server_ipv6' in self.config: + if port not in self.tcp_ipv6_servers_pool: + logging.info("stopped server at %s:%d already stop" % (self.config['server_ipv6'], port)) + else: + logging.info("stopped server at %s:%d" % (self.config['server_ipv6'], port)) + try: + self.tcp_ipv6_servers_pool[port].destroy() + del self.tcp_ipv6_servers_pool[port] + #self.udp_ipv6_servers_pool[port].destroy() + #del self.udp_ipv6_servers_pool[port] + except Exception, e: + logging.warn(e) - return True + return True def get_server_transfer(self, port): port = int(port) diff --git a/shadowsocks/shadowsocks.sql b/shadowsocks/shadowsocks.sql index b828eaa..5ce63a6 100644 --- a/shadowsocks/shadowsocks.sql +++ b/shadowsocks/shadowsocks.sql @@ -6,8 +6,8 @@ CREATE TABLE `user` ( `pass` varchar(16) NOT NULL, `passwd` varchar(16) NOT NULL, `t` int(11) NOT NULL DEFAULT '0', - `u` int(20) NOT NULL, - `d` int(20) NOT NULL, + `u` bigint(20) NOT NULL, + `d` bigint(20) NOT NULL, `transfer_enable` bigint(20) NOT NULL, `port` int(11) NOT NULL, `switch` tinyint(4) NOT NULL DEFAULT '1',