Merge pull request #538 from peralta/patch-1

mitmweb: start onboarding app if instructed to
This commit is contained in:
Maximilian Hils 2015-03-26 17:26:50 +01:00
commit 9a328c12a4

View File

@ -133,6 +133,9 @@ class WebMaster(flow.FlowMaster):
"Could not read flow file: %s"%v, "Could not read flow file: %s"%v,
"error" "error"
) )
if self.options.app:
self.start_app(self.options.app_host, self.options.app_port)
def tick(self): def tick(self):
flow.FlowMaster.tick(self, self.masterq, timeout=0) flow.FlowMaster.tick(self, self.masterq, timeout=0)
@ -173,4 +176,4 @@ class WebMaster(flow.FlowMaster):
def add_event(self, e, level="info"): def add_event(self, e, level="info"):
super(WebMaster, self).add_event(e, level) super(WebMaster, self).add_event(e, level)
self.state.add_event(e, level) self.state.add_event(e, level)