From 4b2a95a390a6772209e9cf6370b04a2d69f6bc54 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Fri, 9 Mar 2018 10:49:33 +0100
Subject: [PATCH] Stop Gracefully fixed

---
 .vs/AACloudPlatform/v15/.suo | Bin 76800 -> 76800 bytes
 Trading Bot Main Loop.js     |   3 +-
 Utilities.js                 |  69 +++++++++++++++++++----------------
 this.vm.config.json          |   2 +-
 4 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo
index 6b22e7c7ea1d1ab5005e056d2efd31acab2fabb2..aa52631ffc178604837bbc9d14b24681a7c697c1 100644
GIT binary patch
delta 1159
zcmcgqO-NKx6u#%pd*h7b&y1N)X*HUaI3^lmYG#uSGz%?l6=sx?KjH6~f{@fpMKh%w
zPpLK3=s=<tGS1a37d4cN+9{NYnuJ&k{kX7|1loO)X)arM;NyMwd*__{-FvP$!HW~T
zqmUCwts=FNnmIiO*YN@02xlxA`!HPyhAb=+c87_CkX(j*1~bDYh609V7M1L4VZZ^w
z#4j<SMP4ZA(&wdy@?RV;<zT5YURn63z(V_#uQ@2D6<*5%RMQH-8XwTpMcomV;x@}^
zW}t@10lARF82fR+L#5otsMMeamC1S>@KjS{^3&tO4JIAK{+zAoUuVF~8J`_Gl0r&I
zInj|clFf`3GnUGf5>iT{@LF9U+H)e%RhNe6Wg6_b?1hdzKbllO1vr}-;VbQu&B}9G
zK^ZB+?2!<()%#Mhp-_%bp82cv%*htEtBN?#(PGB*PA!eK?Bd|z%Cf3C3J2TEu(!_(
zKi>_)6ZgF7B9;p9HydLu;k=3%A4~c4>U|wRAhlUjWC1%_+tr9>B%8sw*0$9)?77IK
zcuD@J9jZF#G)chpl?ZW}7*{*(%Yr6^TU7};EODyto&kF=k0I8;^)4}??-QE4L-9}#
zbvhKXHd7c>Qjv;0p2};d?X?$R({3BZ1`*394b<?$C9~h;@YP&64Ih~RdlP4W!#Qt#
zhyR>~M;90qqZ6ZXtbQ*#UK-Jm5lWjz%K<gb1=##3j&|NT2P;$aZqI_Xsd-mbU5Sak
z7;`WoE@po&j!o%NKYq5&q=tBOjl0qPT-zpUz<@_BK^v!wHtR`rO`CA3AsnNd)F_Te
zGXL*T{E&{LAGK03E{tfYcG?YH3Xo&<+fX{}b^!8|r?KN(05yDZfqj<4{4q8PcfJRm
zxBlcd=fMoBK`FyMJ@1`P1+2V^AyEK{Zah1)u2^*lX#Wu~6rhH$(B%)Ftvc`-@(G3o
N=-Lkax>Xn`egk|1kwO3f

delta 1335
zcmd5+e@u*V82>(R?|VNgxzM?cB!|<rR?LsH$yH~JnUjCol3}jINg*?1UX@O2Q=VBj
zhI4eY(5}AGW}(rBKTM^yl){F!=GXjVhVs0(V>JG-`NOmKv**Y6d7k%q-tT9x+#||8
zqTeY<9(QO~IWH8<0u<wEu>#grubG8*X);vfc4@lN!5BM4*g_~I<Po+JMo9JsH8x4h
zMVXxADyL+%8}g{3>a!qLQwR&R3$<BfC<XbvL3>94Coc*gk)VVZjVp<OX#Od7NtmW8
zn8U3JO)4peJUW=84$}@(VKli}s7*0zj|J0)`Qnrt%OsiHbZl@$;e;|P)<2Jj3wW?>
zBHA~L`1Y^{lX7FQwQN<wBIoV)$fh*rF|L@>Ni_ixgF1qA1}kFuERk(xyST+Q0A|K^
zu$^o>h4PgkD<E$NSy8|kJpq(LI$K0Lo-0k^a=BAA^#G-3Fb8uIHd2v;?Pt+6{CFw|
zV`nhAwh;H7O$2|y>i1ZAOVvlftL~lHQXh^lADQ?kERf(wrWnR-my~2)but!UEN?iK
z7NVaP99&T;1S7%ry=E|Uq7o;u1zyAZJw}LJpv)YU6=YZ9xsg3JH{&6^COaMm`Tp}K
zME#eak|G60+ftL-z^t-+9)B>r6ufmJwxR`B)<46?6|>Yz%XBsuzn0I&q)HviyqF7q
zRS4dzSUCES%Ul+*^L-2sH0Ge#Z^FyHUFyt-p-K~U^;v3U9au3V*UjCfn?RD4-v9V=
z(c-%6y(wa0+j!jE7K3M9I!ry%{kPYRa=DDRUzoV5tp~hE1@AqfvGR4u-xB~^sxDxM
zYbN?{+0eQsj#swt2EL(s?Pyl01?+fgMss&I9_cmW<?b(dvCo9D&ZI_n9{ga;4DWz|
zAKDDu@MI8t8c<>J{WyMo$PXwEWTNMdo?BnF0;W0a+&<)2`wSqANlvycuvsjr2mUX%
ztrz}4F&X1Z=HvXv&fl@DSq=dWjQ&VI6==}=PT#E8!O$=3i`OPWgn+B-VtB&)E*KN|
W2N3hZ2@F%OOl?juKo|Iop!o))V6%Y$

diff --git a/Trading Bot Main Loop.js b/Trading Bot Main Loop.js
index 7735c9399..23c8cbe11 100644
--- a/Trading Bot Main Loop.js	
+++ b/Trading Bot Main Loop.js	
@@ -330,6 +330,7 @@
 
                     if (FULL_LOG === true) { logger.write("[INFO] run -> loopControl -> Stopping the Loop Gracefully. See you next time! :-)"); }
                     callBackFunction(global.DEFAULT_OK_RESPONSE);
+                    return;
 
                 }
 
@@ -357,7 +358,7 @@
                 try {
 
                     vmConfig = JSON.parse(fs.readFileSync('this.vm.config.json', 'utf8'));
-                    return vmConfig.stopGrafully;
+                    return JSON.parse(vmConfig.stopGrafully);
                 }
                 catch (err) {
                     const logText = "[ERROR] 'readConfig' - ERROR : " + err.message;
diff --git a/Utilities.js b/Utilities.js
index b2a0384c4..a0597dd93 100644
--- a/Utilities.js
+++ b/Utilities.js
@@ -1,6 +1,8 @@
 
 exports.newUtilities = function newUtilities(BOT) {
 
+    const FULL_LOG = true;
+
     let bot = BOT;
     const ROOT_DIR = '../';
 
@@ -20,54 +22,58 @@ exports.newUtilities = function newUtilities(BOT) {
 
     return utilities;
 
-    function pad(str, max) {
-        str = str.toString();
-        return str.length < max ? pad("0" + str, max) : str;
-    }
-
     function createFolderIfNeeded(path, azureFileStorage, callBackFunction) {
 
-        if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> Entering function."); }
+        try {
 
-        let splittedPath = path.split("/");
+            if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> Entering function."); }
+            if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> path = " + path); }
 
-        let partialPath = '';
-        let separator = "";
+            let splittedPath = path.split("/");
 
-        let i = 0;
-        loop();
+            let partialPath = '';
+            let separator = "";
 
-        function loop() {
+            let i = 0;
+            loop();
 
-            if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> loop -> Entering function."); }
+            function loop() {
 
-            partialPath = partialPath + separator + splittedPath[i];
-            separator = "/";
+                if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> path = " + path); }
 
-            i++;
+                partialPath = partialPath + separator + splittedPath[i];
+                separator = "/";
 
-            azureFileStorage.createFolder(partialPath, checkLoop);
+                i++;
 
-            function checkLoop(err) {
+                if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> partialPath = " + partialPath); }
 
-                if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> loop -> checkLoop -> Entering function."); }
+                azureFileStorage.createFolder(partialPath, checkLoop);
 
-                if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
-                    logger.write("[ERROR] createFolderIfNeeded -> loop -> checkLoop -> err = " + err.message);
-                    callBackFunction(err);
-                    return;
-                }
+                function checkLoop(err) {
 
-                if (i === splittedPath.length) {
+                    if (FULL_LOG === true) { logger.write("[INFO] createFolderIfNeeded -> loop -> checkLoop -> Entering function."); }
 
-                    callBackFunction(global.DEFAULT_OK_RESPONSE);
+                    if (err.result !== global.DEFAULT_OK_RESPONSE.result) {
+                        logger.write("[ERROR] createFolderIfNeeded -> loop -> checkLoop -> err = " + err.message);
+                        callBackFunction(err);
+                        return;
+                    }
 
-                } else {
+                    if (i === splittedPath.length) {
 
-                    loop();
+                        callBackFunction(global.DEFAULT_OK_RESPONSE);
 
+                    } else {
+
+                        loop();
+
+                    }
                 }
             }
+        } catch (err) {
+            logger.write("[ERROR] createFolderIfNeeded -> Error = " + err.message);
+            callBackFunction(global.DEFAULT_FAIL_RESPONSE);
         }
     }
 
@@ -81,7 +87,8 @@ exports.newUtilities = function newUtilities(BOT) {
         }
     }
 
-
-
-
+    function pad(str, max) {
+        str = str.toString();
+        return str.length < max ? pad("0" + str, max) : str;
+    }
 }
\ No newline at end of file
diff --git a/this.vm.config.json b/this.vm.config.json
index 4d1d36e09..0d3f77473 100644
--- a/this.vm.config.json
+++ b/this.vm.config.json
@@ -2,5 +2,5 @@
   "bot": {
     "path": "../Bots/AAMasters/AAMariam-Trading-Bot"
   },
-  "stopGrafully": "false"
+  "stopGrafully": "true"
 }
\ No newline at end of file