aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-07-24 10:32:56 +1200
committerAldo Cortesi <aldo@nullcube.com>2013-07-24 10:32:56 +1200
commit5c1157ddaf01b9245519d176469587aa6539ac5d (patch)
tree064877904e9a52199f5a84ea6d465b544d7c71ad /libmproxy/console
parent64ce3b358ffed2eb34d6836b57dd7849ce856a09 (diff)
downloadmitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.gz
mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.tar.bz2
mitmproxy-5c1157ddaf01b9245519d176469587aa6539ac5d.zip
Move app instantiation out of proxy.py.
Diffstat (limited to 'libmproxy/console')
-rw-r--r--libmproxy/console/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index ef799167..dd3adaa9 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -328,6 +328,9 @@ class ConsoleState(flow.State):
class Options(object):
attributes = [
+ "app",
+ "app_domain",
+ "app_ip",
"anticache",
"anticomp",
"client_replay",
@@ -426,6 +429,9 @@ class ConsoleMaster(flow.FlowMaster):
print >> sys.stderr, "Script load error:", err
sys.exit(1)
+ if options.app:
+ self.start_app(options.app_domain, options.app_ip)
+
def start_stream(self, path):
path = os.path.expanduser(path)
try: