From 54cdca6b8f0d093a40b6992fc0493fd907aedfc5 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Mon, 6 Apr 2020 16:35:43 +0200
Subject: [PATCH] bug fixed

---
 EventServerClient.js | 4 ++--
 Session.js           | 4 ++--
 server.js            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/EventServerClient.js b/EventServerClient.js
index a094c4314..3695225b2 100644
--- a/EventServerClient.js
+++ b/EventServerClient.js
@@ -47,7 +47,7 @@
                 }
             }
             WEB_SOCKETS_CLIENT.onmessage = e => {
-
+                
                 try {
                     if (INFO_LOG === true) {
                         console.log('Websocket Message Received: ' + e.data)
@@ -63,7 +63,7 @@
                             key = message.eventHandlerName + '-' + message.eventType
                         }
                         let handler = eventListeners.get(key)
-                        if (handler) {
+                        if (handler) {             
                             handler.callBack(message)
                         }
                         return
diff --git a/Session.js b/Session.js
index 1a15af6d8..09e4aa90e 100644
--- a/Session.js
+++ b/Session.js
@@ -38,8 +38,8 @@
             /* Listen to event to start or stop the session. */
             bot.sessionKey = bot.processNode.session.name + '-' + bot.processNode.session.type + '-' + bot.processNode.session.id
  
-            global.EVENT_SERVER_CLIENT.listenToEvent(bot.sessionKey, 'Run Session', undefined, undefined, undefined, runSession)
-            global.EVENT_SERVER_CLIENT.listenToEvent(bot.sessionKey, 'Stop Session', undefined, undefined, undefined, stopSession)
+            global.EVENT_SERVER_CLIENT.listenToEvent(bot.sessionKey, 'Run Session', undefined, bot.sessionKey, undefined, runSession)
+            global.EVENT_SERVER_CLIENT.listenToEvent(bot.sessionKey, 'Stop Session', undefined, bot.sessionKey, undefined, stopSession)
 
             callBackFunction(global.DEFAULT_OK_RESPONSE)
             return
diff --git a/server.js b/server.js
index 4b813c954..631ed3edb 100644
--- a/server.js
+++ b/server.js
@@ -121,7 +121,7 @@ function preLoader() {
         /* The Task Manager sent the info via a process argument. In this case we listen to an event with the Task Info that should be emitted at the UI */
         try {
             //console.log('[INFO] Task Server -> server -> preLoader -> Listening to starting event -> key = ' + 'Task Server - ' + taskId)
-            global.EVENT_SERVER_CLIENT.listenToEvent('Task Server - ' + taskId, 'Run Task', undefined, undefined, undefined, eventReceived)
+            global.EVENT_SERVER_CLIENT.listenToEvent('Task Server - ' + taskId, 'Run Task', undefined, 'Task Server - ' + taskId, undefined, eventReceived)
             global.EVENT_SERVER_CLIENT.raiseEvent('Task Manager - ' + taskId, 'Nodejs Process Ready for Task')
             function eventReceived(message) {
                 global.TASK_NODE = message
@@ -136,7 +136,7 @@ function preLoader() {
     else {  /* This process was started not by the Task Manager, but independently (most likely for debugging purposes). In this case we listen to an event with the Task Info that should be emitted at the UI */
         try { 
             //console.log('[INFO] Task Server -> server -> preLoader -> Waiting for event to start debugging...')
-            global.EVENT_SERVER_CLIENT.listenToEvent('Task Server', 'Debug Task Started', undefined, undefined, undefined, startDebugging)
+            global.EVENT_SERVER_CLIENT.listenToEvent('Task Server', 'Debug Task Started', undefined, 'Task Server', undefined, startDebugging)
             function startDebugging(message) {
                 global.TASK_NODE = message
                 global.TASK_NODE = JSON.parse(message.event.definition)