From 6d0dbb51496e14ca8351091b27f3a705e6fa16cf Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 28 Jan 2020 16:21:14 +0100
Subject: [PATCH] Bug Fixes

---
 Historic-Trades/User.Bot.js | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/Historic-Trades/User.Bot.js b/Historic-Trades/User.Bot.js
index a279cba8c..257c52365 100644
--- a/Historic-Trades/User.Bot.js
+++ b/Historic-Trades/User.Bot.js
@@ -48,6 +48,11 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, fileSt
     function start(callBackFunction) {
         try {
 
+            if (global.STOP_TASK_GRACEFULLY === true) {
+                callBackFunction(global.DEFAULT_OK_RESPONSE);
+                return
+            }
+
             let exchangeId = bot.exchange.toLowerCase()
             let options
             let fetchType = "by Time"
@@ -76,16 +81,24 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, fileSt
                 }
             }
 
+            let key = process.env.KEY
+            let secret = process.env.SECRET
+
+            if (key === "undefined") { key = undefined }
+            if (secret === "undefined") { secret = undefined }
+
             const limit = 1000
             const exchangeClass = ccxt[exchangeId]
-            const exchange = new exchangeClass({
-                'apiKey': process.env.KEY,
-                'secret': process.env.SECRET,
+            const exchangeConstructorParams = {
+                'apiKey': key,
+                'secret': secret,
                 'timeout': 30000,
                 'enableRateLimit': true,
                 verbose: false,
                 options: options
-            })
+            }
+            //console.log(JSON.stringify(exchangeConstructorParams))
+            const exchange = new exchangeClass(exchangeConstructorParams)
 
             begin()
 
@@ -96,6 +109,10 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, fileSt
 
                 await getFirstId()
                 await getTrades()
+                if (global.STOP_TASK_GRACEFULLY === true) {
+                    callBackFunction(global.DEFAULT_OK_RESPONSE);
+                    return
+                }
                 await saveTrades()
             }
 
@@ -224,6 +241,9 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, fileSt
                         } else {
                             break
                         }
+                        if (global.STOP_TASK_GRACEFULLY === true) {
+                            break
+                        }
                     }
                 } catch (err) {
                     logger.write(MODULE_NAME, "[ERROR] start -> getTrades -> err = " + err.stack);
@@ -369,6 +389,11 @@ exports.newUserBot = function newUserBot(bot, logger, COMMONS, UTILITIES, fileSt
 
                     }
                     function controlLoop() {
+                        if (global.STOP_TASK_GRACEFULLY === true) {
+                            callBackFunction(global.DEFAULT_OK_RESPONSE);
+                            return
+                        }
+
                         i++
                         if (i < allTrades.length) {
                             setImmediate(loop)