Stopped returning outputs from executeContract
This commit is contained in:
@@ -10,23 +10,23 @@ def executeContract(module, outputs, process):
|
|||||||
|
|
||||||
responses = buildOperation(module, outputs)
|
responses = buildOperation(module, outputs)
|
||||||
|
|
||||||
return outputs, responses
|
return responses
|
||||||
|
|
||||||
elif module.kind == "action":
|
elif module.kind == "action":
|
||||||
|
|
||||||
response = buildAction(module, outputs, process)
|
response = buildAction(module, outputs, process)
|
||||||
|
|
||||||
return outputs, response
|
return response
|
||||||
|
|
||||||
elif module.kind == "monitor":
|
elif module.kind == "monitor":
|
||||||
response = buildMonitor(module, outputs)
|
response = buildMonitor(module, outputs)
|
||||||
|
|
||||||
return outputs, response
|
return response
|
||||||
|
|
||||||
elif module.kind == "recursiveset":
|
elif module.kind == "recursiveset":
|
||||||
response = buildRecursive(module, outputs)
|
response = buildRecursive(module, outputs)
|
||||||
|
|
||||||
return outputs, response
|
return response
|
||||||
|
|
||||||
#except Exception as error:
|
#except Exception as error:
|
||||||
#outputs = manageFailure(error, module)
|
#outputs = manageFailure(error, module)
|
||||||
@@ -18,7 +18,7 @@ def manageLifecycle(module):
|
|||||||
while lifecycles[module.name]["mode"] == "continuous":
|
while lifecycles[module.name]["mode"] == "continuous":
|
||||||
lifecycles[module.name]["state"] = "active"
|
lifecycles[module.name]["state"] = "active"
|
||||||
|
|
||||||
outputs, response = executeContract(module, outputs, None)
|
response = executeContract(module, outputs, None)
|
||||||
|
|
||||||
if lifecycle_log:
|
if lifecycle_log:
|
||||||
print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
|
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(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
|
||||||
print(lifecycles)
|
print(lifecycles)
|
||||||
|
|
||||||
outputs, response = executeContract(module, outputs, None)
|
response = executeContract(module, outputs, None)
|
||||||
|
|
||||||
lifecycles[module.name]["state"] = "stopped"
|
lifecycles[module.name]["state"] = "stopped"
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ def buildOperation(definition, outputs):
|
|||||||
if action.kind == "action":
|
if action.kind == "action":
|
||||||
outputs["processes"][definition.name][action.name] = {}
|
outputs["processes"][definition.name][action.name] = {}
|
||||||
|
|
||||||
outputs, response = executeContract(action, outputs, definition)
|
response = executeContract(action, outputs, definition)
|
||||||
|
|
||||||
responses.append(response)
|
responses.append(response)
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ def buildRecursive(definition, outputs):
|
|||||||
if job.kind == "action":
|
if job.kind == "action":
|
||||||
outputs["processes"][definition.name][job.name] = {}
|
outputs["processes"][definition.name][job.name] = {}
|
||||||
|
|
||||||
outputs, response = executeContract(job, outputs, definition)
|
response = executeContract(job, outputs, definition)
|
||||||
responses.append(response)
|
responses.append(response)
|
||||||
if job.kind == "action":
|
if job.kind == "action":
|
||||||
outputs["processes"][definition.name][job.name]["response"] = response
|
outputs["processes"][definition.name][job.name]["response"] = response
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ def buildListener(listener, self):
|
|||||||
logging.info(outputs["firewall_allowed"])
|
logging.info(outputs["firewall_allowed"])
|
||||||
|
|
||||||
#Process and forward to RMASS
|
#Process and forward to RMASS
|
||||||
outputs, responses = executeContract(listener.execute, outputs, None)
|
responses = executeContract(listener.execute, outputs, None)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user