aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-22 01:35:57 +0100
committerGitHub <noreply@github.com>2018-02-22 01:35:57 +0100
commit1cacefa104626e4e0df5ffb2aa8b0c6f16b615b2 (patch)
treeb84631f951fbc971cb70684f90e6d6f2f8bba8cc
parent95c160ac131e235644c12795dc66b46f9b4478cd (diff)
parent1cc5f30b2d561090b1b7558e49805acec2383004 (diff)
downloadmitmproxy-1cacefa104626e4e0df5ffb2aa8b0c6f16b615b2.tar.gz
mitmproxy-1cacefa104626e4e0df5ffb2aa8b0c6f16b615b2.tar.bz2
mitmproxy-1cacefa104626e4e0df5ffb2aa8b0c6f16b615b2.zip
Merge pull request #2888 from kajojify/issue-2885
Fix verbosity mode. Fix #2885
-rw-r--r--mitmproxy/tools/main.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py
index 3735cbf4..5c2d9f2f 100644
--- a/mitmproxy/tools/main.py
+++ b/mitmproxy/tools/main.py
@@ -44,8 +44,13 @@ def process_options(parser, opts, args):
print(debug.dump_system_info())
sys.exit(0)
if args.quiet or args.options or args.commands:
+ # also reduce log verbosity if --options or --commands is passed,
+ # we don't want log messages from regular startup then.
args.verbosity = 'error'
args.flow_detail = 0
+ if args.verbose:
+ args.verbosity = 'debug'
+ args.flow_detail = 2
adict = {}
for n in dir(args):