From b7c1d057828054a7e8d5f9ccf2c3c93ca8888ed3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Bakhmutov Date: Fri, 13 Jun 2014 14:14:55 +0700 Subject: Remove global should_exit and fix tests --- libmproxy/console/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmproxy/console') 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() -- cgit v1.2.3