diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2020-04-02 11:39:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-02 11:39:25 +0200 |
| commit | 49bc7d944a94f2e4bb0f7b9572234a5b67cb0fb2 (patch) | |
| tree | 9f06fc53484554ef8f7489c3e7998329ab3c827f | |
| parent | 3046a628fd0b719ff587eac5f5fd6965cd5eac89 (diff) | |
| parent | ca4b7a307f6f13d03879617434e734aa237d9cb1 (diff) | |
| download | mitmproxy-49bc7d944a94f2e4bb0f7b9572234a5b67cb0fb2.tar.gz mitmproxy-49bc7d944a94f2e4bb0f7b9572234a5b67cb0fb2.tar.bz2 mitmproxy-49bc7d944a94f2e4bb0f7b9572234a5b67cb0fb2.zip | |
Merge pull request #3881 from Prinzhorn/serverconnect
Only emit "serverconnect" after successfully connecting
| -rw-r--r-- | mitmproxy/proxy/protocol/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/proxy/protocol/base.py b/mitmproxy/proxy/protocol/base.py index 2063f901..3bf03521 100644 --- a/mitmproxy/proxy/protocol/base.py +++ b/mitmproxy/proxy/protocol/base.py @@ -160,10 +160,10 @@ class ServerConnectionMixin: """ if not self.server_conn.address: raise exceptions.ProtocolException("Cannot connect to server, no server address given.") - self.log("serverconnect", "debug", [repr(self.server_conn.address)]) - self.channel.ask("serverconnect", self.server_conn) try: self.server_conn.connect() + self.log("serverconnect", "debug", [repr(self.server_conn.address)]) + self.channel.ask("serverconnect", self.server_conn) except exceptions.TcpException as e: raise exceptions.ProtocolException( "Server connection to {} failed: {}".format( |