aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-02-08 22:42:27 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-02-08 22:42:27 +0100
commit0c04abb6e4c549646c06ef9e270d1b42c1ffaf1d (patch)
tree9824b52c89962be6e131e59ab170de5dd801ce0c
parent505d3964952d0fa0779eda5c61a0456f4f2f6fb9 (diff)
downloadmitmproxy-0c04abb6e4c549646c06ef9e270d1b42c1ffaf1d.tar.gz
mitmproxy-0c04abb6e4c549646c06ef9e270d1b42c1ffaf1d.tar.bz2
mitmproxy-0c04abb6e4c549646c06ef9e270d1b42c1ffaf1d.zip
fix pathod main script
-rw-r--r--libpathod/test.py2
-rwxr-xr-xpathod2
2 files changed, 3 insertions, 1 deletions
diff --git a/libpathod/test.py b/libpathod/test.py
index 11c62303..398e94be 100644
--- a/libpathod/test.py
+++ b/libpathod/test.py
@@ -66,6 +66,7 @@ class Daemon:
class _PaThread(threading.Thread):
def __init__(self, iface, q, ssl, daemonargs):
threading.Thread.__init__(self)
+ self.name = "PathodThread"
self.iface, self.q, self.ssl = iface, q, ssl
self.daemonargs = daemonargs
@@ -75,5 +76,6 @@ class _PaThread(threading.Thread):
ssl = self.ssl,
**self.daemonargs
)
+ self.name = "PathodThread (%s:%s)" % (self.server.address.host, self.server.address.port)
self.q.put(self.server.address.port)
self.server.serve_forever()
diff --git a/pathod b/pathod
index 10e9ba55..4e292cb1 100755
--- a/pathod
+++ b/pathod
@@ -100,7 +100,7 @@ def main(parser, args):
parser.error("%s You probably want to a -d argument."%str(v))
try:
- print "%s listening on %s:%s"%(version.NAMEVERSION, args.address, pd.port)
+ print "%s listening on %s:%s"%(version.NAMEVERSION, args.address, pd.address.port)
pd.serve_forever()
except KeyboardInterrupt:
pass