diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 13:32:24 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-01-27 13:32:24 +1300 |
| commit | efe11a0782a668b4310849f7696cc89004d82f45 (patch) | |
| tree | 70169d8f7074480e5df469a3a2c9482cb28298da /libmproxy/console.py | |
| parent | 077272ec9703ff1b3f20f69c971adf63a6dd05c1 (diff) | |
| download | mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.tar.gz mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.tar.bz2 mitmproxy-efe11a0782a668b4310849f7696cc89004d82f45.zip | |
Kill deadlock that sometimes occurred on shutdown.
Diffstat (limited to 'libmproxy/console.py')
| -rw-r--r-- | libmproxy/console.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py index d0213249..fbb8a925 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -714,6 +714,9 @@ class ConsoleMaster(controller.Master): self.ui.run_wrapper(self.loop) # If True, quit just pops out to connection list view. + print >> sys.stderr, "Shutting down..." + sys.stderr.flush() + self.shutdown() self.nested = False def make_view(self): @@ -1015,7 +1018,6 @@ class ConsoleMaster(controller.Master): self.view.keypress(size, k) except (Stop, KeyboardInterrupt): pass - self.shutdown() def shutdown(self): for i in self.state.flow_list: |