diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-02-07 07:08:59 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-02-07 07:08:59 +0100 |
| commit | 545fc2506bdcb4a17705db9bc708d22613ace039 (patch) | |
| tree | 2157bae5fab45ec66b9630ac47a98a9e1e0fdfa3 /libmproxy | |
| parent | 9526c5d56570652400929cc33f8fb36f361eecd6 (diff) | |
| download | mitmproxy-545fc2506bdcb4a17705db9bc708d22613ace039.tar.gz mitmproxy-545fc2506bdcb4a17705db9bc708d22613ace039.tar.bz2 mitmproxy-545fc2506bdcb4a17705db9bc708d22613ace039.zip | |
Achievement Unlocked: Proxy Chain
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/controller.py | 1 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 2 | ||||
| -rw-r--r-- | libmproxy/script.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index b662b6d5..470d88fc 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -72,6 +72,7 @@ class Slave(threading.Thread): self.channel, self.server = channel, server self.server.set_channel(channel) threading.Thread.__init__(self) + self.name = "SlaveThread (%s:%s)" % (self.server.address.host, self.server.address.port) def run(self): self.server.serve_forever() diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 8bd93122..5526e102 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -185,6 +185,8 @@ from .protocol.http import HTTPResponse class RequestReplayThread(threading.Thread): + name="RequestReplayThread" + def __init__(self, config, flow, masterq): self.config, self.flow, self.channel = config, flow, controller.Channel(masterq) threading.Thread.__init__(self) diff --git a/libmproxy/script.py b/libmproxy/script.py index 0912c9ae..d34d3383 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -108,7 +108,7 @@ def _handle_concurrent_reply(fn, o, args=[], kwargs={}): def run(): fn(*args, **kwargs) reply(o) - threading.Thread(target=run).start() + threading.Thread(target=run, name="ScriptThread").start() def concurrent(fn): |