Stopped returning outputs in buildAction. Confirmed working
This commit is contained in:
@@ -8,7 +8,7 @@ from core.runtime.runtimecontract import buildRuntimeAttr, buildPreRuntimeAttr
|
||||
def buildAction (action, outputs, process):
|
||||
action_log = True
|
||||
|
||||
outputs, resolved, match, filter = buildPreRuntimeAttr(action, outputs, process)
|
||||
resolved, match, filter = buildPreRuntimeAttr(action, outputs, process)
|
||||
|
||||
if hasattr(action, "allowaction"):
|
||||
if not action.allowaction:
|
||||
@@ -22,7 +22,7 @@ def buildAction (action, outputs, process):
|
||||
if response is None:
|
||||
return outputs, None
|
||||
|
||||
outputs, response = buildRuntimeAttr(action, outputs, resolved, response, process)
|
||||
response = buildRuntimeAttr(action, outputs, resolved, response, process)
|
||||
|
||||
if action_log:
|
||||
logging.info(f"{action.name} completed")
|
||||
|
||||
@@ -15,7 +15,7 @@ def executeContract(module, outputs, process):
|
||||
|
||||
elif module.kind == "action":
|
||||
|
||||
outputs, response = buildAction(module, outputs, process)
|
||||
response = buildAction(module, outputs, process)
|
||||
|
||||
return outputs, response
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ outputs = {}
|
||||
resolved = {}
|
||||
|
||||
def buildMonitor(monitor, outputs):
|
||||
outputs = loadSave(monitor, outputs)
|
||||
loadSave(monitor, outputs)
|
||||
|
||||
response, outputs = executeRequest(monitor, outputs, resolved)
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ def manageFailure(error, action, outputs):
|
||||
else:
|
||||
print(f"{type(error).__name__} detected during {action.name}. Applying recovery policy.")
|
||||
|
||||
outputs, response = buildAction(repair, outputs, None)
|
||||
response = buildAction(repair, outputs, None)
|
||||
|
||||
return outputs
|
||||
print(f"{error}")
|
||||
|
||||
@@ -7,11 +7,11 @@ def buildPreRuntimeAttr(action, outputs, process):
|
||||
from core.runtime.applyconditions import applyConditions
|
||||
from core.runtime.resolver import resolveItem
|
||||
|
||||
outputs = loadSave(action, outputs)
|
||||
loadSave(action, outputs)
|
||||
|
||||
resolved = resolveItem(action, outputs)
|
||||
|
||||
resolved, outputs = readRow(action, resolved, outputs)
|
||||
readRow(action, resolved, outputs)
|
||||
|
||||
match, filter = applyConditions(action, resolved, outputs)
|
||||
|
||||
@@ -19,7 +19,7 @@ def buildPreRuntimeAttr(action, outputs, process):
|
||||
logging.info(filter.get("print"))
|
||||
addStopSignal(action, outputs, process)
|
||||
|
||||
return outputs, resolved, match, filter
|
||||
return resolved, match, filter
|
||||
|
||||
|
||||
def buildRuntimeAttr(action, outputs, resolved, response, process):
|
||||
@@ -48,4 +48,4 @@ def buildRuntimeAttr(action, outputs, resolved, response, process):
|
||||
|
||||
buildLog(action, outputs, response)
|
||||
|
||||
return outputs, response
|
||||
return response
|
||||
+1
-1
@@ -2,5 +2,5 @@ from plugins import rmass
|
||||
from core import buildAction
|
||||
|
||||
outputs = {}
|
||||
outputs = buildAction(rmass.actions.pingsynapse, outputs)
|
||||
response = buildAction(rmass.actions.pingsynapse, outputs)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user