diff --git a/.travis.yml b/.travis.yml index 20710fc..6e8a5d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ python: - 2.7 before_install: - sudo apt-get update -qq - - sudo apt-get install -qq build-essential libssl-dev swig libevent-dev python-gevent python-m2crypto python-numpy - - pip install m2crypto gevent salsa20 + - sudo apt-get install -qq build-essential libssl-dev swig python-m2crypto python-numpy + - pip install m2crypto salsa20 script: - python test.py -c test/table.json - python test.py -c test/aes.json - python test.py -c test/salsa20.json - python test.py -c test/server-multi-passwd.json + - python test.py -c test/workers.json diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py index 3f72ed2..e969d3e 100644 --- a/shadowsocks/tcprelay.py +++ b/shadowsocks/tcprelay.py @@ -188,7 +188,7 @@ class TCPRelayHandler(object): raise Exception('can not parse header') addrtype, remote_addr, remote_port, header_length =\ header_result - logging.info('connecting %s:%d' % (remote_addr, remote_port)) + logging.debug('connecting %s:%d' % (remote_addr, remote_port)) if is_local: # forward address to remote self.write_all_to_sock('\x05\x00\x00\x01' + diff --git a/shadowsocks/utils.py b/shadowsocks/utils.py index bc9d92a..9ee6b2f 100644 --- a/shadowsocks/utils.py +++ b/shadowsocks/utils.py @@ -142,7 +142,7 @@ def get_config(is_local): if config['verbose']: level = logging.DEBUG else: - level = logging.WARNING + level = logging.INFO logging.getLogger('').handlers = [] logging.basicConfig(level=level, format='%(asctime)s %(levelname)-8s %(message)s',