Housekeeping and migrated prints to logging
This commit is contained in:
@@ -2,6 +2,8 @@ import requests
|
||||
import threading
|
||||
import os
|
||||
import time
|
||||
import logging
|
||||
|
||||
from .request import buildRequest
|
||||
|
||||
#session = requests.Session()
|
||||
@@ -48,48 +50,11 @@ def executeRequest(action, outputs, resolved):
|
||||
return response, outputs
|
||||
|
||||
except (requests.Timeout, requests.ConnectionError) as error:
|
||||
print(f"{type(error).__name__} during {action.name}: {error}")
|
||||
#print(f"{type(error).__name__} during {action.name}: {error}")
|
||||
logging.warning(f"{type(error).__name__} during {action.name}: {error}")
|
||||
session = getSession(reset=True)
|
||||
|
||||
if attempt == 0:
|
||||
print(f"Retrying {action.name}")
|
||||
logging.warning(f"Retrying {action.name}")
|
||||
|
||||
return None, 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
|
||||
|
||||
Reference in New Issue
Block a user