diff options
Diffstat (limited to 'mitmproxy/main.py')
| -rw-r--r-- | mitmproxy/main.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mitmproxy/main.py b/mitmproxy/main.py index 6d44108e..6ae99bdd 100644 --- a/mitmproxy/main.py +++ b/mitmproxy/main.py @@ -68,7 +68,7 @@ def mitmproxy(args=None): # pragma: no cover console_options.eventlog = args.eventlog console_options.follow = args.follow console_options.intercept = args.intercept - console_options.limit = args.limit + console_options.filter = args.filter console_options.no_mouse = args.no_mouse server = process_options(parser, console_options, args) @@ -92,6 +92,7 @@ def mitmdump(args=None): # pragma: no cover if args.quiet: args.flow_detail = 0 + master = None try: dump_options = dump.Options(**cmdline.get_common_options(args)) dump_options.flow_detail = args.flow_detail @@ -110,7 +111,7 @@ def mitmdump(args=None): # pragma: no cover sys.exit(1) except (KeyboardInterrupt, _thread.error): pass - if master.has_errored: + if master is None or master.has_errored: print("mitmdump: errors occurred during run", file=sys.stderr) sys.exit(1) |