Extended positional variables to allow operation information to pass through to signal registry and dependency check at the action level for the new process registry (Working). Introduced track for operation
This commit is contained in:
@@ -7,7 +7,7 @@ from core.runtime.applyconditions import applyConditions
|
||||
from core.runtime.responsepolicy import responsePolicy
|
||||
from core.runtime.stopsignals import addStopSignal
|
||||
|
||||
def buildPreRuntimeAttr(action, outputs):
|
||||
def buildPreRuntimeAttr(action, outputs, process):
|
||||
outputs = loadSave(action, outputs)
|
||||
|
||||
resolved = resolveItem(action, outputs)
|
||||
@@ -17,7 +17,7 @@ def buildPreRuntimeAttr(action, outputs):
|
||||
match, filter = applyConditions(action, resolved, outputs)
|
||||
|
||||
if match:
|
||||
outputs = addStopSignal(action, outputs)
|
||||
outputs = addStopSignal(action, outputs, process)
|
||||
|
||||
return outputs, resolved, match, filter
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
def checkDependency(action, outputs):
|
||||
#def checkDependency(action, operation, outputs):
|
||||
#def checkDependency(action, outputs):
|
||||
def checkDependency(action, outputs, operation):
|
||||
if hasattr(action, "depends"):
|
||||
stop = any(
|
||||
#dependency in outputs["processes"][operation.name]["stopsignals"]
|
||||
dependency in outputs["stopsignals"]
|
||||
dependency in outputs["processes"][operation.name]["stopsignals"]
|
||||
#dependency in outputs["stopsignals"]
|
||||
for dependency in action.depends
|
||||
)
|
||||
|
||||
@@ -12,9 +12,9 @@ def checkDependency(action, outputs):
|
||||
|
||||
return False
|
||||
|
||||
def addStopSignal(action, outputs):
|
||||
#def addStopSignal(action, operation, outputs):
|
||||
#def addStopSignal(action, outputs):
|
||||
def addStopSignal(action, outputs, operation):
|
||||
if hasattr(action, "depends"):
|
||||
#outputs["processes"][operation.name]["stopsignals"].append(action.alias)
|
||||
outputs["stopsignals"].append(action.alias)
|
||||
outputs["processes"][operation.name]["stopsignals"].append(action.alias)
|
||||
#outputs["stopsignals"].append(action.alias)
|
||||
return outputs
|
||||
Reference in New Issue
Block a user