diff --git a/core/execution/createthread.py b/core/execution/createthread.py index 3c11efa..7768f72 100644 --- a/core/execution/createthread.py +++ b/core/execution/createthread.py @@ -13,18 +13,23 @@ def buildThread(module, lifecycles): thread = threading.Thread( target=manageLifecycle, - args=(module, lifecycles) + args=(module, lifecycles), + name=module.name ) + thread.start() - registryname = threadname - registryvalue = thread + #registryname = threadname + #registryvalue = thread + + registryname = thread.name + registryvalue = thread.native_id lifecycles = registerLifecycle (module, lifecycles, registryname, registryvalue) threadlist.append(thread) - print(threadlist) - print(lifecycles) + #print(threadlist) + #print(lifecycles) return thread, lifecycles diff --git a/core/execution/lifecyclemanager/lifecyclemanager.py b/core/execution/lifecyclemanager/lifecyclemanager.py index 7ccd14d..10c01ee 100644 --- a/core/execution/lifecyclemanager/lifecyclemanager.py +++ b/core/execution/lifecyclemanager/lifecyclemanager.py @@ -5,24 +5,25 @@ from core.execution.operation import buildOperation from core.execution.action import buildAction from core.execution.executioncontract import executeContract -sleeptime = int(os.environ.get("REFRESH_INTERVAL", 180)) +#sleeptime = int(os.environ.get("REFRESH_INTERVAL", 180)) def manageLifecycle(module, lifecycles): #lifecycles, state): - #print(lifecycles[module.name]["mode"]) + + outputs = {} if lifecycles[module.name]["mode"] == "continuous": while lifecycles[module.name]["mode"] == "continuous": - print(lifecycles) + #print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]["mode"]} mode") + #print(f"{lifecycles[module.name]}") - outputs = executeContract(module) + outputs, response = executeContract(module, outputs) - #print(lifecycles) - - time.sleep(sleeptime) + print(f"{module.name} thread {lifecycles[module.name][module.name]} running in {lifecycles[module.name]["mode"]} mode") + time.sleep(module.sleeptime) elif lifecycles[module.name]["mode"] == "oneshot": print(lifecycles) - outputs = executeContract(module) + outputs, response = executeContract(module) #print(lifecycles) return