Stopped passing process into execution contract and action
This commit is contained in:
@@ -5,10 +5,10 @@ from core.runtime.runtimecontract import buildRuntimeAttr, buildPreRuntimeAttr
|
||||
#from core.runtime.stopsignals import addStopSignal
|
||||
|
||||
|
||||
def buildAction (action, outputs, process):
|
||||
def buildAction (action, outputs):
|
||||
action_log = True
|
||||
|
||||
resolved, match, filter = buildPreRuntimeAttr(action, outputs, process)
|
||||
resolved, match, filter = buildPreRuntimeAttr(action, outputs)
|
||||
|
||||
if hasattr(action, "allowaction"):
|
||||
if not action.allowaction:
|
||||
@@ -25,7 +25,7 @@ def buildAction (action, outputs, process):
|
||||
if response is None:
|
||||
return outputs, None
|
||||
|
||||
response = buildRuntimeAttr(action, outputs, resolved, response, process)
|
||||
response = buildRuntimeAttr(action, outputs, resolved, response)
|
||||
|
||||
if action_log:
|
||||
logging.info(f"{action.name} completed")
|
||||
|
||||
@@ -4,7 +4,7 @@ from core.execution.monitor import buildMonitor
|
||||
#from core.runtime import manageFailure
|
||||
from core.execution.recursive import buildRecursive
|
||||
|
||||
def executeContract(module, outputs, process):
|
||||
def executeContract(module, outputs):
|
||||
|
||||
if module.kind == "operation":
|
||||
|
||||
@@ -14,7 +14,7 @@ def executeContract(module, outputs, process):
|
||||
|
||||
elif module.kind == "action":
|
||||
|
||||
response = buildAction(module, outputs, process)
|
||||
response = buildAction(module, outputs)
|
||||
|
||||
return response
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ def manageLifecycle(module):
|
||||
while lifecycles[module.name]["mode"] == "continuous":
|
||||
lifecycles[module.name]["state"] = "active"
|
||||
|
||||
response = executeContract(module, outputs, None)
|
||||
response = executeContract(module, outputs)
|
||||
|
||||
if lifecycle_log:
|
||||
print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
|
||||
@@ -34,7 +34,7 @@ def manageLifecycle(module):
|
||||
print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]['mode']} mode")
|
||||
print(lifecycles)
|
||||
|
||||
response = executeContract(module, outputs, None)
|
||||
response = executeContract(module, outputs)
|
||||
|
||||
lifecycles[module.name]["state"] = "stopped"
|
||||
|
||||
|
||||
@@ -36,6 +36,6 @@ def buildMonitor(monitor, outputs):
|
||||
logging.info(filter.get("print"))
|
||||
module = filter["execute"]
|
||||
|
||||
response = executeContract(filter["execute"], outputs, None)
|
||||
response = executeContract(filter["execute"], outputs)
|
||||
|
||||
return response
|
||||
Reference in New Issue
Block a user