david/rmmanager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strengthened stability by introducing TimeoutError handling

Browse Source
This commit is contained in:
Lyncoln
2026-10-26 13:10:58 -04:00
parent 202000f44c
commit 55f1357aef
1 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/apirequest/execute.py
+51 -23
View File
@@ -31,33 +31,61 @@ def executeRequest(action, outputs, resolved):
f"{threading.current_thread().name} thread"
)
try:
for attempt in range(2):
request, outputs = buildRequest(action, outputs, resolved)
response = session.request(
method=request["method"],
url=request["path"],
json=request.get("object"),
headers=request.get("headers"),
data=request.get("data"),
files=request.get("files")
try:
response = session.request(
method=request["method"],
url=request["path"],
json=request.get("object"),
headers=request.get("headers"),
data=request.get("data"),
files=request.get("files"),
timeout=(10, 30)
)
return response, outputs
except requests.ConnectionError as error:
print(f"Request failed due to {error} during {action.name}")
except (requests.ConnectTimeout, requests.ConnectionError) as error:
print(f"{type(error).__name__} during {action.name}: {error}")
session = getSession(reset=True)
session = getSession(reset=True)
if attempt == 0:
print(f"Retrying {action.name}")
print(f"Retrying {action.name}")
response = session.request(
method=request["method"],
url=request["path"],
json=request.get("object"),
headers=request.get("headers"),
data=request.get("data")
)
return response, outputs
# try:
# request, outputs = buildRequest(action, outputs, resolved)
#
# response = session.request(
# method=request["method"],
# url=request["path"],
# json=request.get("object"),
# headers=request.get("headers"),
# data=request.get("data"),
# files=request.get("files"),
# timeout=(10, 30)
# )
#
# except requests.ConnectionError as error:
# print(f"Request failed due to {error} during {action.name}")
#
# session = getSession(reset=True)
#
# print(f"Retrying {action.name}")
#
# response = session.request(
# method=request["method"],
# url=request["path"],
# json=request.get("object"),
# headers=request.get("headers"),
# data=request.get("data"),
# files=request.get("files"),
# timeout=(10, 30)
# )
#
# return response, outputs
#
# except requests.Timeout as error:
# print(f"Request timed out during {action.name}: {error}")
# session = getSession(reset=True)
return response, outputs