diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-12 10:55:47 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-12 10:55:47 -0300 |
| commit | 27950f19721ae68152b84d874702ca81f1b6ecee (patch) | |
| tree | 12573d1c3c9976d0b39016f3f45a0ef78c1a759d /libmproxy/controller.py | |
| parent | 30213d6370bca2bb222e315a63bf4d924a9b0b94 (diff) | |
| parent | e18294437c4629f26dc65e16a9252ef61a109284 (diff) | |
| download | mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.tar.gz mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.tar.bz2 mitmproxy-27950f19721ae68152b84d874702ca81f1b6ecee.zip | |
Merge remote-tracking branch 'base/master'
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 39e7695f..9ca89184 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -108,7 +108,11 @@ 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) + + # 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() def handle(self, mtype, obj): |