GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-09-08 17:09:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #1247: catch exceptions when getting socket address failed

Browse Source
This commit is contained in:
debugtalk
2022-04-17 11:44:06 +08:00
parent 0085e24227
commit b9bf614fd6
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/CHANGELOG.md
+5
View File
@@ -1,5 +1,10 @@
# Release History
## 3.1.9 (2022-04-17)
- fix #1247: catch exceptions caused by GA report failure
- fix #1246: catch exceptions when getting socket address failed
## 3.1.8 (2022-03-22)
- feat: add `--profile` flag for har2case to support overwrite headers/cookies with specified yaml/json configuration file
httprunner/client.py
+11 -12
View File
@@ -180,20 +180,19 @@ class HttpSession(requests.Session):
response_time_ms = round((time.time() - start_timestamp) * 1000, 2)
try:
client_ip, client_port = response.raw.connection.sock.getsockname()
except AttributeError:
client_ip, client_port = response.raw.connection.sock.socket.getsockname()
self.data.address.client_ip = client_ip
self.data.address.client_port = client_port
logger.debug(f"client IP: {client_ip}, Port: {client_port}")
client_ip, client_port = response.raw._connection.sock.getsockname()
self.data.address.client_ip = client_ip
self.data.address.client_port = client_port
logger.debug(f"client IP: {client_ip}, Port: {client_port}")
except Exception:
pass
try:
server_ip, server_port = response.raw.connection.sock.getpeername()
except AttributeError:
server_ip, server_port = response.raw.connection.sock.socket.getpeername()
self.data.address.server_ip = server_ip
self.data.address.server_port = server_port
logger.debug(f"server IP: {server_ip}, Port: {server_port}")
server_ip, server_port = response.raw._connection.sock.getpeername()
except Exception:
self.data.address.server_ip = server_ip
self.data.address.server_port = server_port
logger.debug(f"server IP: {server_ip}, Port: {server_port}")
# get length of the response content
content_size = int(dict(response.headers).get("content-length") or 0)