Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3881 from Prinzhorn/serverconnect

Browse Source 
Only emit "serverconnect" after successfully connecting
This commit is contained in:
Maximilian Hils 2020-04-02 11:39:25 +02:00 committed by GitHub
commit 49bc7d944a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mitmproxy/proxy/protocol/base.py
View File

@ -160,10 +160,10 @@ class ServerConnectionMixin:
""" """
if not self.server_conn.address: if not self.server_conn.address:
raise exceptions.ProtocolException("Cannot connect to server, no server address given.") 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: try:
self.server_conn.connect() 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: except exceptions.TcpException as e:
raise exceptions.ProtocolException( raise exceptions.ProtocolException(
"Server connection to {} failed: {}".format( "Server connection to {} failed: {}".format(