From 8af26bd0b7bbde32a95ce937afc178e75c51da71 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 9 Jan 2015 16:40:26 +0100 Subject: fix #443 --- libmproxy/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmproxy/controller.py') diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 39e7695f..980ff8c0 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -108,7 +108,7 @@ class Master(object): self.should_exit.clear() self.server.start_slave(Slave, Channel(self.masterq, self.should_exit)) while not self.should_exit.is_set(): - self.tick(self.masterq, 0.01) + self.tick(self.masterq, 0.1) self.shutdown() def handle(self, mtype, obj): -- cgit v1.2.3 From e18294437c4629f26dc65e16a9252ef61a109284 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Fri, 9 Jan 2015 17:17:12 +0100 Subject: document choice of timeout value, refs #443 --- libmproxy/controller.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libmproxy/controller.py') diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 980ff8c0..9ca89184 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -108,6 +108,10 @@ class Master(object): self.should_exit.clear() self.server.start_slave(Slave, Channel(self.masterq, self.should_exit)) while not self.should_exit.is_set(): + + # Don't choose a very small timeout in Python 2: + # https://github.com/mitmproxy/mitmproxy/issues/443 + # TODO: Lower the timeout value if we move to Python 3. self.tick(self.masterq, 0.1) self.shutdown() -- cgit v1.2.3