diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:44 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-18 17:19:44 +0100 |
| commit | ce38a17893791944fb8b4f589e7ce00d79b8ced0 (patch) | |
| tree | a26c992e1011cab0558efa389dee561bcf694d62 /mitmproxy | |
| parent | c07cd857a76db5a4d9dbfe46abc84bb6c20088f1 (diff) | |
| parent | 843b2e28bc4fcadb854b4b50c2f56a67bf63866a (diff) | |
| download | mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.gz mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.bz2 mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.zip | |
Merge pull request #238 from mitmproxy/log_levels
Log Levels
Diffstat (limited to 'mitmproxy')
| -rwxr-xr-x | mitmproxy | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -23,6 +23,11 @@ if __name__ == '__main__': action="store", dest="palette", help="Select color palette: " + ", ".join(palettes.palettes.keys()) ) + parser.add_argument( + "-e", + action="store_true", dest="eventlog", + help="Show event log." + ) group = parser.add_argument_group( @@ -47,10 +52,8 @@ if __name__ == '__main__': print >> sys.stderr, "mitmproxy:", v.args[0] sys.exit(1) - try: - opts = console.Options(**cmdline.get_common_options(options)) - except cmdline.OptionException, v: - parser.error(v.message) + opts = console.Options(**cmdline.get_common_options(options)) + opts.eventlog = options.eventlog opts.intercept = options.intercept opts.debug = options.debug opts.palette = options.palette |
