diff --git a/core/execution/executioncontract.py b/core/execution/executioncontract.py index 51636a1..9de661b 100644 --- a/core/execution/executioncontract.py +++ b/core/execution/executioncontract.py @@ -10,23 +10,23 @@ def executeContract(module, outputs, process): responses = buildOperation(module, outputs) - return outputs, responses + return responses elif module.kind == "action": response = buildAction(module, outputs, process) - return outputs, response + return response elif module.kind == "monitor": response = buildMonitor(module, outputs) - return outputs, response + return response elif module.kind == "recursiveset": response = buildRecursive(module, outputs) - return outputs, response + return response #except Exception as error: #outputs = manageFailure(error, module) \ No newline at end of file diff --git a/core/execution/lifecyclemanager/lifecyclemanager.py b/core/execution/lifecyclemanager/lifecyclemanager.py index d3e851d..ce67118 100644 --- a/core/execution/lifecyclemanager/lifecyclemanager.py +++ b/core/execution/lifecyclemanager/lifecyclemanager.py @@ -18,7 +18,7 @@ def manageLifecycle(module): while lifecycles[module.name]["mode"] == "continuous": lifecycles[module.name]["state"] = "active" - outputs, response = executeContract(module, outputs, None) + response = executeContract(module, outputs, None) if lifecycle_log: print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode") @@ -35,7 +35,7 @@ def manageLifecycle(module): print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode") print(lifecycles) - outputs, response = executeContract(module, outputs, None) + response = executeContract(module, outputs, None) lifecycles[module.name]["state"] = "stopped" diff --git a/core/execution/operation/operation.py b/core/execution/operation/operation.py index 320052f..ca48bab 100644 --- a/core/execution/operation/operation.py +++ b/core/execution/operation/operation.py @@ -36,7 +36,7 @@ def buildOperation(definition, outputs): if action.kind == "action": outputs["processes"][definition.name][action.name] = {} - outputs, response = executeContract(action, outputs, definition) + response = executeContract(action, outputs, definition) responses.append(response) diff --git a/core/execution/recursive.py b/core/execution/recursive.py index c3d5c98..cd2b7b5 100644 --- a/core/execution/recursive.py +++ b/core/execution/recursive.py @@ -65,7 +65,7 @@ def buildRecursive(definition, outputs): if job.kind == "action": outputs["processes"][definition.name][job.name] = {} - outputs, response = executeContract(job, outputs, definition) + response = executeContract(job, outputs, definition) responses.append(response) if job.kind == "action": outputs["processes"][definition.name][job.name]["response"] = response diff --git a/core/server/createlistener.py b/core/server/createlistener.py index f17ab66..2e3383a 100644 --- a/core/server/createlistener.py +++ b/core/server/createlistener.py @@ -36,7 +36,7 @@ def buildListener(listener, self): logging.info(outputs["firewall_allowed"]) #Process and forward to RMASS - outputs, responses = executeContract(listener.execute, outputs, None) + responses = executeContract(listener.execute, outputs, None)