diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-26 18:17:36 +0100 |
| commit | 04f2467e84905d44483469cf43ada4ec44faa203 (patch) | |
| tree | 9076642f7439a877d1839293739b75d3c0f805c5 /libmproxy/web | |
| parent | 9854379046a5464f4fd638785bafca87b91a495a (diff) | |
| parent | 423530fc258ddd09642de401c4fd5cf71ed06be6 (diff) | |
| download | mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.gz mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.tar.bz2 mitmproxy-04f2467e84905d44483469cf43ada4ec44faa203.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/web')
| -rw-r--r-- | libmproxy/web/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py index 173ddf9f..7016eeb8 100644 --- a/libmproxy/web/__init__.py +++ b/libmproxy/web/__init__.py @@ -133,6 +133,9 @@ class WebMaster(flow.FlowMaster): "Could not read flow file: %s"%v, "error" ) + if self.options.app: + self.start_app(self.options.app_host, self.options.app_port) + def tick(self): flow.FlowMaster.tick(self, self.masterq, timeout=0) @@ -173,4 +176,4 @@ class WebMaster(flow.FlowMaster): def add_event(self, e, level="info"): super(WebMaster, self).add_event(e, level) - self.state.add_event(e, level)
\ No newline at end of file + self.state.add_event(e, level) |