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/console/__init__.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/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index c1ef4331..e660f312 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -577,7 +577,7 @@ class ConsoleMaster(flow.FlowMaster): self.view_flowlist() - self.server.start_slave(controller.Slave, controller.Channel(self.masterq)) + self.server.start_slave(controller.Slave, controller.Channel(self.masterq, self.should_exit)) if self.options.rfile: ret = self.load_flows(self.options.rfile) @@ -780,7 +780,7 @@ class ConsoleMaster(flow.FlowMaster): def loop(self): changed = True try: - while not controller.should_exit: + while not self.should_exit.is_set(): startloop = time.time() if changed: self.statusbar.redraw() |