aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests/test_framework
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-03-17 18:36:39 -0400
committerJohn Newbery <john@johnnewbery.com>2017-03-17 18:36:39 -0400
commite722777a4974272fe5d0bd06364aa887b599922b (patch)
tree83d4845fb4b71d838ee94c62b864761952096402 /qa/rpc-tests/test_framework
parent1f7065367c6e901f1f047f4bc0ce63633fd7602b (diff)
downloadbitcoin-e722777a4974272fe5d0bd06364aa887b599922b.tar.xz
fix logging in nulldummy and proxy_test
Diffstat (limited to 'qa/rpc-tests/test_framework')
-rw-r--r--qa/rpc-tests/test_framework/socks5.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/qa/rpc-tests/test_framework/socks5.py b/qa/rpc-tests/test_framework/socks5.py
index 450bf3775e..dd7624d454 100644
--- a/qa/rpc-tests/test_framework/socks5.py
+++ b/qa/rpc-tests/test_framework/socks5.py
@@ -6,6 +6,9 @@
import socket, threading, queue
import traceback, sys
+import logging
+
+logger = logging.getLogger("TestFramework.socks5")
### Protocol constants
class Command:
@@ -112,10 +115,10 @@ class Socks5Connection(object):
cmdin = Socks5Command(cmd, atyp, addr, port, username, password)
self.serv.queue.put(cmdin)
- print('Proxy: ', cmdin)
+ logger.info('Proxy: %s', cmdin)
# Fall through to disconnect
except Exception as e:
- traceback.print_exc(file=sys.stderr)
+ logger.exception("socks5 request handling failed.")
self.serv.queue.put(e)
finally:
self.conn.close()