diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-17 09:40:25 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-17 09:40:25 +1200 |
| commit | f7da58ca9b8b3dc33f5a9b57999b07f99db5bc63 (patch) | |
| tree | 956984514258b8ebde4548b2032202447ee37dc7 /libmproxy/web/__init__.py | |
| parent | 4f56b76b2c811006045c3226848aa5e122fb36ab (diff) | |
| download | mitmproxy-f7da58ca9b8b3dc33f5a9b57999b07f99db5bc63.tar.gz mitmproxy-f7da58ca9b8b3dc33f5a9b57999b07f99db5bc63.tar.bz2 mitmproxy-f7da58ca9b8b3dc33f5a9b57999b07f99db5bc63.zip | |
Basic websocket connection, code cleanup.
Diffstat (limited to 'libmproxy/web/__init__.py')
| -rw-r--r-- | libmproxy/web/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py index 8f98060c..044cb0cd 100644 --- a/libmproxy/web/__init__.py +++ b/libmproxy/web/__init__.py @@ -58,6 +58,7 @@ class Options(object): class WebMaster(flow.FlowMaster): def __init__(self, server, options): self.options = options + self.app = app.Application(self.options.wdebug) flow.FlowMaster.__init__(self, server, WebState()) def tick(self): @@ -70,9 +71,7 @@ class WebMaster(flow.FlowMaster): ) iol = tornado.ioloop.IOLoop.instance() - http_server = tornado.httpserver.HTTPServer( - app.Application(self.options.wdebug) - ) + http_server = tornado.httpserver.HTTPServer(self.app) http_server.listen(self.options.wport) tornado.ioloop.PeriodicCallback(self.tick, 5).start() @@ -82,6 +81,7 @@ class WebMaster(flow.FlowMaster): self.shutdown() def handle_request(self, f): + print f flow.FlowMaster.handle_request(self, f) if f: f.reply() |