From 835ab7fc31b8c1e666f5b5eb861139bd4bebb711 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 20 Sep 2019 16:28:25 +0200 Subject: [PATCH] Stopping Processes correctly --- StatusReport.js | 5 ----- server.js | 14 ++++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/StatusReport.js b/StatusReport.js index 51d4778ff..7f6fcc120 100644 --- a/StatusReport.js +++ b/StatusReport.js @@ -71,11 +71,6 @@ function responseCallBack(message) { if (message.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write(MODULE_NAME, "[ERROR] initialize -> Could not register event listener for event 'Status Report Updated' -> Message = " + message); - let event = { - reason: 'This process depends on ' + key + ' which is currently not running.' - } - global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Process Terminated', event) callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } diff --git a/server.js b/server.js index 1e4bd36b4..483ceb216 100644 --- a/server.js +++ b/server.js @@ -45,7 +45,7 @@ process.on('exit', function (code) { let key = global.TASK_NODE.name + '-' + global.TASK_NODE.type + '-' + global.TASK_NODE.id - global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Task Stopped') + global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Stopped') // Meaning Task Stopped global.SYSTEM_EVENT_HANDLER.deleteEventHandler(key) global.SYSTEM_EVENT_HANDLER.finalize() global.SYSTEM_EVENT_HANDLER = undefined @@ -124,11 +124,13 @@ global.EXIT_NODE_PROCESS = function exitProcess() { /* Delete the event handler for each process. */ let key = code.team + "-" + code.bot + "-" + code.process - let event = { - reason: 'Signal Received to Terminate this Process.' - } - global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Process Terminated', event) + global.SYSTEM_EVENT_HANDLER.deleteEventHandler(key) + + let process = global.TASK_NODE.bot.processes[i] + + key = process.name + '-' + process.type + '-' + process.id + global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Stopped') // Meaning Process Stopped } console.log("[INFO] Task Server -> " + global.TASK_NODE.name + " -> EXIT_NODE_PROCESS -> Task Server Stopped."); @@ -153,7 +155,7 @@ function bootLoader() { let key = global.TASK_NODE.name + '-' + global.TASK_NODE.type + '-' + global.TASK_NODE.id global.SYSTEM_EVENT_HANDLER.createEventHandler(key) - global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Task Running') + global.SYSTEM_EVENT_HANDLER.raiseEvent(key, 'Running') // Meaning Task Running global.HEARTBEAT_INTERVAL_HANDLER = setInterval(hearBeat, 1000) function hearBeat() {