diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-19 13:15:44 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 13:15:44 +1300 |
| commit | 12cdc1577a8425660f5a018ca6c5a5dad5225826 (patch) | |
| tree | 31199e39c194f08982e554e5d1621d035a7affae /mitmproxy/dump.py | |
| parent | 8b5fb4b61391377fae38c54b94f9aceef3ed6333 (diff) | |
| parent | 264a09e7789500673282075b2f5b9956268f0cea (diff) | |
| download | mitmproxy-12cdc1577a8425660f5a018ca6c5a5dad5225826.tar.gz mitmproxy-12cdc1577a8425660f5a018ca6c5a5dad5225826.tar.bz2 mitmproxy-12cdc1577a8425660f5a018ca6c5a5dad5225826.zip | |
Merge pull request #1630 from cortesi/multiserv
Let's dispense with this fiction that we support multiple servers
Diffstat (limited to 'mitmproxy/dump.py')
| -rw-r--r-- | mitmproxy/dump.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py index bc8716e7..e2167259 100644 --- a/mitmproxy/dump.py +++ b/mitmproxy/dump.py @@ -32,7 +32,7 @@ class Options(options.Options): class DumpMaster(flow.FlowMaster): - def __init__(self, server, options): + def __init__(self, options, server): flow.FlowMaster.__init__(self, options, server) self.has_errored = False self.addons.add(termlog.TermLog()) @@ -41,7 +41,7 @@ class DumpMaster(flow.FlowMaster): # This line is just for type hinting self.options = self.options # type: Options - if not self.options.no_server and server: + if not self.options.no_server: self.add_log( "Proxy server listening at http://{}".format(server.address), "info" |