From ca9a7feccaef5d742b0352e12044fd7c9b8f9f89 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 4 Apr 2020 14:41:57 +0200 Subject: [PATCH 1/3] Update User.Bot.js --- .../Historic-OHLCVs/User.Bot.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Legacy-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js b/Legacy-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js index 954010720..eb3061ecc 100644 --- a/Legacy-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js +++ b/Legacy-Code/Masters/bots/Exchange-Raw-Data-Sensor-Bot/Historic-OHLCVs/User.Bot.js @@ -346,12 +346,18 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, FILE_S } catch (err) { if (err.stack.toString().indexOf('ERR_RATE_LIMIT') >= 0) { logger.write(MODULE_NAME, "[ERROR] start -> getOHLCVs -> Retrying Later -> The Exchange " + bot.exchange + " is saying you are requesting data too often. I will retry the request later, no action is required. To avoid this happening again please increase the rateLimit at the Exchange node config. You might continue seeing this if you are retrieving data from multiple markets at the same time. In this case I tried to get 1 min OHLCVs from " + symbol); - } else { - logger.write(MODULE_NAME, "[ERROR] start -> getOHLCVs -> Retrying Later -> err = " + err.stack); + return + } + + if (err.stack.toString().indexOf('RequestTimeout') >= 0) { + logger.write(MODULE_NAME, "[ERROR] start -> getOHLCVs -> Retrying Later -> The Exchange " + bot.exchange + " is not responding at the moment. I will save the data already fetched and try to reconnect later to fetch the rest of the missing data." ); + return } - + + logger.write(MODULE_NAME, "[ERROR] start -> getOHLCVs -> Retrying Later -> err = " + err.stack); callBackFunction(global.DEFAULT_RETRY_RESPONSE); abort = true + return } } From 0bdc3778a0730d6e43818fbaf2a07bf5a2c3ee9e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 4 Apr 2020 15:09:10 +0200 Subject: [PATCH 2/3] Update UiObject.js --- CanvasApp/FloatingSpace/UiObject.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CanvasApp/FloatingSpace/UiObject.js b/CanvasApp/FloatingSpace/UiObject.js index 875fe2ecf..1219557a7 100644 --- a/CanvasApp/FloatingSpace/UiObject.js +++ b/CanvasApp/FloatingSpace/UiObject.js @@ -1113,11 +1113,11 @@ function newUiObject () { } function drawReferenceLine () { - if (canvas.floatingSpace.drawReferenceLines === false) { return } + if (canvas.floatingSpace.drawReferenceLines === false && thisObject.isOnFocus === false) { return } if (thisObject.payload.referenceParent === undefined) { return } if (thisObject.payload.referenceParent.payload === undefined) { return } if (thisObject.payload.referenceParent.payload.floatingObject === undefined) { return } - if (thisObject.payload.referenceParent.payload.floatingObject.isParentCollapsed === true) { return } + if (thisObject.payload.referenceParent.payload.floatingObject.isParentCollapsed === true && thisObject.isOnFocus === false) { return } let targetPoint = { x: thisObject.payload.referenceParent.payload.position.x, From 7ffb2ea0d325c54beadad4465bdefaf2bfc76b59 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 4 Apr 2020 15:40:54 +0200 Subject: [PATCH 3/3] Starting Tasks with events --- TaskManager/server.js | 4 ++-- TaskServer/server.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/TaskManager/server.js b/TaskManager/server.js index d426bd320..746f895ad 100644 --- a/TaskManager/server.js +++ b/TaskManager/server.js @@ -72,7 +72,7 @@ function runTask(message) { id: message.event.taskId, name: message.event.taskName } - + tasks.set(message.event.taskId, task) task.childProcess.on('error', (err) => { @@ -86,7 +86,7 @@ function runTask(message) { tasks.delete(task.id) }) - setTimeout(sendStartingEvent, 3000) + global.SYSTEM_EVENT_HANDLER.listenToEvent('Task Manager - ' + message.event.taskId, 'Nodejs Process Ready for Task', undefined, undefined, undefined, sendStartingEvent) function sendStartingEvent() { //console.log('[INFO] Task Manager -> server -> runTask -> Emitting Event -> key = ' + 'Task Server - ' + task.id) diff --git a/TaskServer/server.js b/TaskServer/server.js index f299cafcc..566a26f89 100644 --- a/TaskServer/server.js +++ b/TaskServer/server.js @@ -27,8 +27,6 @@ global.CUSTOM_FAIL_RESPONSE = { const ONE_DAY_IN_MILISECONDS = 24 * 60 * 60 * 1000; -/* Process Events */ - process.on('uncaughtException', function (err) { console.log('[ERROR] Task Server -> server -> uncaughtException -> err.message = ' + err.message) console.log('[ERROR] Task Server -> server -> uncaughtException -> err.stack = ' + err.stack) @@ -122,6 +120,7 @@ function preLoader() { try { //console.log('[INFO] Task Server -> server -> preLoader -> Listening to starting event -> key = ' + 'Task Server - ' + taskId) global.SYSTEM_EVENT_HANDLER.listenToEvent('Task Server - ' + taskId, 'Run Task', undefined, undefined, undefined, eventReceived) + global.SYSTEM_EVENT_HANDLER.raiseEvent('Task Manager - ' + taskId, 'Nodejs Process Ready for Task') function eventReceived(message) { global.TASK_NODE = message global.TASK_NODE = JSON.parse(message.event.definition)