diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2011-03-29 10:57:50 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2011-03-29 10:57:50 +1300 |
| commit | d917cfd916a39f78f91d5960a017a02e5d83ba63 (patch) | |
| tree | eea9c1b40628c9d2a253937a953cccdbdd7cd434 /libmproxy/controller.py | |
| parent | c3105153a5044c49435094505ae13990f48a483f (diff) | |
| download | mitmproxy-d917cfd916a39f78f91d5960a017a02e5d83ba63.tar.gz mitmproxy-d917cfd916a39f78f91d5960a017a02e5d83ba63.tar.bz2 mitmproxy-d917cfd916a39f78f91d5960a017a02e5d83ba63.zip | |
Refactoring.
Diffstat (limited to 'libmproxy/controller.py')
| -rw-r--r-- | libmproxy/controller.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libmproxy/controller.py b/libmproxy/controller.py index 52b6ac6b..f0e65e7f 100644 --- a/libmproxy/controller.py +++ b/libmproxy/controller.py @@ -59,7 +59,7 @@ class Slave(threading.Thread): class Master: def __init__(self, server): self.server = server - self.masterq = None + self.masterq = Queue.Queue() def tick(self, q): try: @@ -75,12 +75,10 @@ class Master: pass def run(self): - q = Queue.Queue() - self.masterq = q - slave = Slave(q, self.server) + slave = Slave(self.masterq, self.server) slave.start() while not exit: - self.tick(q) + self.tick(self.masterq) self.shutdown() def handle(self, msg): |