diff options
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 29e2f7a8..ddfbe7f1 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -29,8 +29,11 @@ class Msg: def send(self, masterq): self.acked = False - masterq.put(self) - return self.q.get() + try: + masterq.put(self, timeout=3) + return self.q.get(timeout=3) + except (Queue.Empty, Queue.Full): + return None class Slave(threading.Thread): |