diff --git a/core/execution/recursive.py b/core/execution/recursive.py index e09cafb..3fd9c12 100644 --- a/core/execution/recursive.py +++ b/core/execution/recursive.py @@ -1,13 +1,13 @@ -from core.execution import action -from core.execution.action.action import buildAction -from core.runtime.runtimecontract import buildPreRuntimeAttr, buildRuntimeAttr -from core.apirequest import executeRequest +import logging +import os + from core.runtime.stopsignals import checkDependency from core.execution.processregistry import registerProcess from rich.progress import track def buildRecursive(definition, outputs): - recursive_log = False + process_log = True + recursive_log = os.environ.get("LOGS_RECURSIVE", "false").lower() == "true" #print(outputs[definition.recursiveset["source"]]) @@ -76,7 +76,9 @@ def buildRecursive(definition, outputs): outputs["processes"][definition.name][job.name]["response"] = response outputs["processes"][definition.name]["completed"].append(job.alias) - + + if process_log: + logging.info(f"{definition.name} completed") retain = definition.recursiveset.get("retain", True) diff --git a/core/runtime/firewall.py b/core/runtime/firewall.py index 0648ba4..7758109 100644 --- a/core/runtime/firewall.py +++ b/core/runtime/firewall.py @@ -1,6 +1,10 @@ +import os + from core.runtime.applyconditions import applyConditions def buildFirewall(listener, outputs): + firewall_log = os.environ.get("LOGS_FIREWALL", "false").lower() == "true" + status_code = 200 outputs["firewall_allowed"] = [] for item in outputs[listener.recursive["source"]]: diff --git a/core/runtime/resolver.py b/core/runtime/resolver.py index 5d6e0a1..be3d92a 100644 --- a/core/runtime/resolver.py +++ b/core/runtime/resolver.py @@ -1,4 +1,8 @@ +import os + def resolveItem(action, item): + resolver_log = os.environ.get("LOGS_RESOLVER", "false").lower() == "true" + resolved = {} if hasattr(action, "resolve"): for label, keys in action.resolve["get"].items(): @@ -8,7 +12,8 @@ def resolveItem(action, item): target = target[key] except (KeyError, IndexError) as error: - print(f"Resolver target key/index {error} not found during {action.name}") + if resolver_log: + print(f"Resolver target key/index {error} not found during {action.name}") target = None resolved[label] = target diff --git a/core/runtime/savedata.py b/core/runtime/savedata.py index e3a933c..e3f7df1 100644 --- a/core/runtime/savedata.py +++ b/core/runtime/savedata.py @@ -2,6 +2,8 @@ import json import os def buildSave(action, outputs): + savedata_log = os.environ.get("LOGS_SAVE_DATA_ACCESS", "false").lower() == "true" + import tempfile if hasattr(action, "savedata"): @@ -36,10 +38,13 @@ def buildSave(action, outputs): except FileNotFoundError: pass - #print(f"Data saved by {action.name} to {action.savepath}") + if savedata_log: + print(f"Data saved by {action.name} to {action.savepath}") return outputs def loadSave(action, outputs): + savedata_log = os.environ.get("LOGS_SAVE_DATA_ACCESS", "false").lower() == "true" + if hasattr(action, "loaddata"): with open(f"{action.savepath}", "r") as save_file: load_data = json.load(save_file) @@ -47,7 +52,8 @@ def loadSave(action, outputs): for load_name in action.loaddata: outputs[load_name] = load_data[load_name] - #print(f"Data loaded by {action.name} from {action.savepath}") + if savedata_log: + print(f"Data loaded by {action.name} from {action.savepath}") return outputs def saveRow(action, outputs, resolved): diff --git a/core/runtime/select.py b/core/runtime/select.py index 50df0c7..64b1e3b 100644 --- a/core/runtime/select.py +++ b/core/runtime/select.py @@ -1,6 +1,9 @@ +import os + def buildSelect(action, outputs): #***THIS IS THE CANONICAL BUILD*** - select_log = False + + select_log = savedata_log = os.environ.get("LOGS_SELECT", "false").lower() == "true" select_data = []