diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-07-03 02:20:38 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-07-03 02:20:38 +0200 |
| commit | df11595fad287a8ffdecd2ccc18b27478925c5b4 (patch) | |
| tree | 9460f817c84425ce313882e4fe8595e0a0c54e35 /libmproxy/flow.py | |
| parent | c039e4a2e322ee4e0a173f164be598dc630d3579 (diff) | |
| parent | b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3 (diff) | |
| download | mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.tar.gz mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.tar.bz2 mitmproxy-df11595fad287a8ffdecd2ccc18b27478925c5b4.zip | |
Merge pull request #286 from m0sth8/remove_global_should_exit
Remove global should_exit and fix tests
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index a440b850..b6b49022 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -654,6 +654,7 @@ class FlowMaster(controller.Master): self.server.config, f, self.masterq, + self.should_exit ) rt.start() # pragma: no cover if block: @@ -792,8 +793,8 @@ class FilteredFlowWriter: class RequestReplayThread(threading.Thread): name="RequestReplayThread" - def __init__(self, config, flow, masterq): - self.config, self.flow, self.channel = config, flow, controller.Channel(masterq) + def __init__(self, config, flow, masterq, should_exit): + self.config, self.flow, self.channel = config, flow, controller.Channel(masterq, should_exit) threading.Thread.__init__(self) def run(self): |