Stopped returning outputs on executeRequest
This commit is contained in:
@@ -47,7 +47,7 @@ def executeRequest(action, outputs, resolved):
|
|||||||
files=request.get("files"),
|
files=request.get("files"),
|
||||||
timeout=(10, 30)
|
timeout=(10, 30)
|
||||||
)
|
)
|
||||||
return response, outputs
|
return response
|
||||||
|
|
||||||
except (requests.Timeout, requests.ConnectionError) as error:
|
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}")
|
||||||
@@ -57,4 +57,4 @@ def executeRequest(action, outputs, resolved):
|
|||||||
if attempt == 0:
|
if attempt == 0:
|
||||||
logging.warning(f"Retrying {action.name}")
|
logging.warning(f"Retrying {action.name}")
|
||||||
|
|
||||||
return None, outputs
|
return None
|
||||||
|
|||||||
@@ -16,11 +16,11 @@ def buildAction (action, outputs, process):
|
|||||||
|
|
||||||
if match:
|
if match:
|
||||||
if filter.get("execute", False):
|
if filter.get("execute", False):
|
||||||
response, outputs = executeRequest(filter["execute"], outputs, resolved)
|
response = executeRequest(filter["execute"], outputs, resolved)
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
response, outputs = executeRequest(action, outputs, resolved)
|
response = executeRequest(action, outputs, resolved)
|
||||||
|
|
||||||
if response is None:
|
if response is None:
|
||||||
return outputs, None
|
return outputs, None
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ resolved = {}
|
|||||||
def buildMonitor(monitor, outputs):
|
def buildMonitor(monitor, outputs):
|
||||||
loadSave(monitor, outputs)
|
loadSave(monitor, outputs)
|
||||||
|
|
||||||
response, outputs = executeRequest(monitor, outputs, resolved)
|
response = executeRequest(monitor, outputs, resolved)
|
||||||
|
|
||||||
if response is None:
|
if response is None:
|
||||||
return None
|
return None
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ def responsePolicy(response, action, outputs, resolved):
|
|||||||
if policy["statuscode"] == response.status_code:
|
if policy["statuscode"] == response.status_code:
|
||||||
logging.warning(policy["print"])
|
logging.warning(policy["print"])
|
||||||
|
|
||||||
newresponse, outputs = executeRequest(policy["execute"], outputs, resolved)
|
newresponse = executeRequest(policy["execute"], outputs, resolved)
|
||||||
|
|
||||||
if policy["response_update"]:
|
if policy["response_update"]:
|
||||||
logging.info("Updating response")
|
logging.info("Updating response")
|
||||||
|
|||||||
Reference in New Issue
Block a user