From edc8337675e3706bb8d13effb97e912a9136d6a7 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 25 Jun 2018 10:20:59 +0200 Subject: [PATCH] Logging Improved --- Assistant.js | 12 +++++++----- Context.js | 4 +++- DataDependencies.js | 2 +- StatusDependencies.js | 7 ++++--- TradingBotProcessMainLoop.js | 16 ++++++++-------- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/Assistant.js b/Assistant.js index 4d791591f..124fd8f87 100644 --- a/Assistant.js +++ b/Assistant.js @@ -229,7 +229,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] initialize -> validateExchangeSyncronicity -> onDone -> Execution finished well."); + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] initialize -> validateExchangeSyncronicity -> onDone -> Execution finished well."); } calculateProfits(); return; } @@ -368,7 +368,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { // Everything went well, we have the information requested. - logger.write(MODULE_NAME, "[INFO] getPositionsAtExchange -> onResponse -> Execution finished well."); + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] getPositionsAtExchange -> onResponse -> Execution finished well."); } exchangePositions = pExchangePositions; ordersExecutionCheck(callBack); return; @@ -584,7 +584,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { // Everything went well, we have the information requested. - logger.write(MODULE_NAME, "[INFO] ordersExecutionCheck -> loopBody -> getPositionTradesAtExchange -> onResponse -> Execution finished well."); + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] ordersExecutionCheck -> loopBody -> getPositionTradesAtExchange -> onResponse -> Execution finished well."); } innerCallBack(pTrades); } break; @@ -990,7 +990,8 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { // Everything went well, we have the information requested. - logger.write(MODULE_NAME, "[INFO] putPosition -> onResponse -> Execution finished well."); + + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] putPosition -> onResponse -> Execution finished well."); } let position = { id: pPositionId, @@ -1105,7 +1106,8 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { // Everything went well, we have the information requested. - logger.write(MODULE_NAME, "[INFO] movePosition -> onResponse -> Execution finished well."); + + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] movePosition -> onResponse -> Execution finished well."); } let newPosition = { id: pPositionId, diff --git a/Context.js b/Context.js index be630f97d..e4ecfe496 100644 --- a/Context.js +++ b/Context.js @@ -503,6 +503,8 @@ try { + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] saveThemAll -> Entering function."); } + writeExecutionContext(onDone); function onDone(err) { @@ -510,7 +512,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] saveThemAll -> onDone -> Execution finished well."); + if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] saveThemAll -> onDone -> Execution finished well."); } callBackFunction(global.DEFAULT_OK_RESPONSE); return; } diff --git a/DataDependencies.js b/DataDependencies.js index db08c5a77..0a2d39f0b 100644 --- a/DataDependencies.js +++ b/DataDependencies.js @@ -1,6 +1,6 @@ exports.newDataDependencies = function newDataDependencies(BOT, logger, DATA_SET, BLOB_STORAGE, UTILITIES) { - const FULL_LOG = true; + const FULL_LOG = false; const LOG_FILE_CONTENT = false; const MODULE_NAME = "Data Dependencies"; diff --git a/StatusDependencies.js b/StatusDependencies.js index f3ec5ee49..cb03c7aef 100644 --- a/StatusDependencies.js +++ b/StatusDependencies.js @@ -1,6 +1,6 @@ exports.newStatusDependencies = function newStatusDependencies(BOT, logger, STATUS_REPORT, BLOB_STORAGE, UTILITIES) { - const FULL_LOG = true; + const FULL_LOG = false; const LOG_FILE_CONTENT = false; const MODULE_NAME = "Status Dependencies"; @@ -57,8 +57,9 @@ switch (err.message) { case global.DEFAULT_OK_RESPONSE.message: { - logger.write(MODULE_NAME, "[INFO] initialize -> onLoad -> Execution finished well. -> bot = " + pStatusDependenciesConfig[i].bot); - logger.write(MODULE_NAME, "[INFO] initialize -> onLoad -> Execution finished well. -> process = " + pStatusDependenciesConfig[i].process); + + if (FULL_LOG === true) { "[INFO] initialize -> onLoad -> Execution finished well. -> bot = " + pStatusDependenciesConfig[i].bot); } + if (FULL_LOG === true) { "[INFO] initialize -> onLoad -> Execution finished well. -> process = " + pStatusDependenciesConfig[i].process); } addReport(); return; diff --git a/TradingBotProcessMainLoop.js b/TradingBotProcessMainLoop.js index fb526dcfa..7d7e98685 100644 --- a/TradingBotProcessMainLoop.js +++ b/TradingBotProcessMainLoop.js @@ -381,7 +381,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeStatusDependencies -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeStatusDependencies -> onInizialized -> Execution finished well."); } initializeDataDependencies(); return; } @@ -447,7 +447,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeDataDependencies -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeDataDependencies -> onInizialized -> Execution finished well."); } initializeContext(); return; } @@ -512,7 +512,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeContext -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeContext -> onInizialized -> Execution finished well."); } initializeExchangeAPI(); return; } @@ -578,7 +578,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeExchangeAPI -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeExchangeAPI -> onInizialized -> Execution finished well."); } initializeAssistant(); return; } @@ -643,7 +643,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeAssistant -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeAssistant -> onInizialized -> Execution finished well."); } initializeUserBot(); return; } @@ -709,7 +709,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeUserBot -> onInizialized -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeUserBot -> onInizialized -> Execution finished well."); } startUserBot(); return; } @@ -773,7 +773,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> startUserBot -> onFinished -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> startUserBot -> onFinished -> Execution finished well."); } saveContext(); return; } @@ -837,7 +837,7 @@ switch (err.result) { case global.DEFAULT_OK_RESPONSE.result: { - logger.write(MODULE_NAME, "[INFO] run -> loop -> saveContext -> onFinished -> Execution finished well."); + if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> saveContext -> onFinished -> Execution finished well."); } nextWaitTime = 'Normal'; loopControl(nextWaitTime); return;