From aefb30ea60255166a4d6b3da8e669a4e89485f6e Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 12 Mar 2014 22:13:00 +0100 Subject: restrict -e to mitmproxy only (not mitmdump) --- libmproxy/cmdline.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libmproxy/cmdline.py') diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index c2911a6b..6c0b1ae8 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -161,7 +161,6 @@ def get_common_options(options): anticache = options.anticache, anticomp = options.anticomp, client_replay = options.client_replay, - eventlog = options.eventlog, kill = options.kill, no_server = options.no_server, refresh_server_playback = not options.norefresh, @@ -196,11 +195,6 @@ def common_options(parser): action="store", type = str, dest="confdir", default='~/.mitmproxy', help = "Configuration directory. (~/.mitmproxy)" ) - parser.add_argument( - "-e", - action="store_true", dest="eventlog", - help="Show event log." - ) parser.add_argument( "-n", action="store_true", dest="no_server", -- cgit v1.2.3 From 7e86744226cc881507bc6c6931316b6b73ed03ec Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 12 Mar 2014 22:39:23 +0100 Subject: add -d switch to mitmdump to compensate for old verbosity functionality --- libmproxy/cmdline.py | 1 + 1 file changed, 1 insertion(+) (limited to 'libmproxy/cmdline.py') diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 6c0b1ae8..72879155 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -161,6 +161,7 @@ def get_common_options(options): anticache = options.anticache, anticomp = options.anticomp, client_replay = options.client_replay, + flow_detail = options.flow_detail, kill = options.kill, no_server = options.no_server, refresh_server_playback = not options.norefresh, -- cgit v1.2.3 From 1bfc1646924d18f2f13ba71b179480963e11dee9 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 13 Mar 2014 01:22:12 +0100 Subject: adjust tests, fix option handling --- libmproxy/cmdline.py | 1 - 1 file changed, 1 deletion(-) (limited to 'libmproxy/cmdline.py') diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 72879155..6c0b1ae8 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -161,7 +161,6 @@ def get_common_options(options): anticache = options.anticache, anticomp = options.anticomp, client_replay = options.client_replay, - flow_detail = options.flow_detail, kill = options.kill, no_server = options.no_server, refresh_server_playback = not options.norefresh, -- cgit v1.2.3 From 843b2e28bc4fcadb854b4b50c2f56a67bf63866a Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Thu, 13 Mar 2014 23:25:13 +0100 Subject: adjust command line docs, fix log typo --- libmproxy/cmdline.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmproxy/cmdline.py') diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 6c0b1ae8..d933ba4b 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -275,8 +275,8 @@ def common_options(parser): ) parser.add_argument( "-v", - action="count", dest="verbose", default=1, - help="Increase verbosity. Can be passed multiple times." + action="store_const", dest="verbose", default=1, const=2, + help="Increase event log verbosity." ) parser.add_argument( "-w", -- cgit v1.2.3