diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-02-26 10:10:27 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-02-26 10:10:27 +1300 |
| commit | 0e867adcf232b8a138dfc3f929aa5b8987576de5 (patch) | |
| tree | 5f750ad2861d01335fa102f8a539ac62dbecd62f /netlib/tcp.py | |
| parent | 49f29ce8eff8251e79d76df72ccc85c66969ba44 (diff) | |
| parent | c276b4294cac97c1281ce9bb4934e49d0ba970a2 (diff) | |
| download | mitmproxy-0e867adcf232b8a138dfc3f929aa5b8987576de5.tar.gz mitmproxy-0e867adcf232b8a138dfc3f929aa5b8987576de5.tar.bz2 mitmproxy-0e867adcf232b8a138dfc3f929aa5b8987576de5.zip | |
Merge branch 'master' of ssh.github.com:cortesi/netlib
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 34e47999..5c351bae 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -380,7 +380,7 @@ class BaseHandler(SocketCloseMixin): -class TCPServer: +class TCPServer(object): request_queue_size = 20 def __init__(self, address): self.address = Address.wrap(address) @@ -416,7 +416,10 @@ class TCPServer: connection, client_address = self.socket.accept() t = threading.Thread( target = self.connection_thread, - args = (connection, client_address) + args = (connection, client_address), + name = "ConnectionThread (%s:%s -> %s:%s)" % + (client_address[0], client_address[1], + self.address.host, self.address.port) ) t.setDaemon(1) t.start() @@ -443,7 +446,7 @@ class TCPServer: print >> fp, exc print >> fp, '-'*40 - def handle_client_connection(self, conn, client_address): # pragma: no cover + def handle_client_connection(self, conn, client_address): # pragma: no cover """ Called after client connection. """ |