aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-03-26 17:26:50 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-03-26 17:26:50 +0100
commit9a328c12a44be83464e736629b6d88d02bc068f0 (patch)
treeade0be6b63ba394a7976f18331cf30271bbc9f22
parentd08fc33f35777bf9e6e5bd8bccd30f8f6ee903e6 (diff)
parent901bf018c06bb75ae35106b60a7553bfed25195a (diff)
downloadmitmproxy-9a328c12a44be83464e736629b6d88d02bc068f0.tar.gz
mitmproxy-9a328c12a44be83464e736629b6d88d02bc068f0.tar.bz2
mitmproxy-9a328c12a44be83464e736629b6d88d02bc068f0.zip
Merge pull request #538 from peralta/patch-1
mitmweb: start onboarding app if instructed to
-rw-r--r--libmproxy/web/__init__.py5
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)