From ce21a1e0cceda5efdc7312150e5eb04e69c0d5f0 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 7 Mar 2018 17:57:17 +0100 Subject: [PATCH] createTextFile re implemented --- .vs/AACloudPlatform/v15/.suo | Bin 65536 -> 74240 bytes Azure File Storage.js | 105 ++++++++++++++++++----------------- Run.js | 10 ++-- 3 files changed, 59 insertions(+), 56 deletions(-) diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index d717665d27d699d338e6c9c7acb69962e736b75f..498bf5021333e0661ebe9737f5e9212acc17ca55 100644 GIT binary patch delta 1399 zcmc(eZA_C_6vv-?dueznqlFBalx!8G6(ry$ONcept@SO=Ov7AE%w&RWxT&a6$@~DQ z=*E~h|M7!ZWVx-2O4Qnmrc9^BnYevef@7LxF|j6?%w*6k@zdO3=czP`%NF&EH~Hnf zJ@?*o&pA(Pt7yFuvg5~G_9PNp!GLlBfV(S z&LlZbzHE{OMD3)19mxzF7rE(kCq4S^JX{l9tQzkpz5LQF^4Ac##0SKBqK^0whmw94 zeTz!U)fQuoA=yhl{RZ4jv5GD-)L$vhMz&ownI{AZvJ|{YfFNl4_xMB;hGU*auRymn&e8=QsF5O%%75M4C zS9#y=NRrFBd_%}pJoMf{qdK_eBPQ#FtmSe84{c%`JFBwQv`_9DLL127o>{1FHX+z@ zLz!CcakN!U)1!H^nWw27P0ONd)3lQq3~xc6e?A7fzrwPfttsy`)_+{zSigQ7Y&|`Q zeQSZWHy_Lw!0N-t)KT9(hRWVtxtk;6dl#{j7F?ZCjM3gKH2BwIt-O!h;T4H}sy(oS z;dbY%IQ2)7TC*o$kSB!f;IQ~@sQmR!^o32TAqWQHu|LRnTdH!My3AnkPgmCd5rat6 z+yOnyDVY_gnjR+F6)1fqIMq56U5Fpgn^H^YxqAEEN8&Fo3mdU|*pB@bWe5(N;S6uK z%%kvwWsfW;r9fQ>=Nqtf%%xlx2Mvntn_##+;!ut&F-8w^sLK6=On%RCEmo|G4_r?I z_ZA{}$qmH1dp*YV@6{V!nP%pz2GTVd_5Wp!XjYOpDq4pY>jmi4?9Z!g-;7QU$e zbBXoZq~eZG!o{24SbA9^W{-qOFT#cJs{fh^IU=5O9~tHZY}gz%DN~e2I5Jv_(%);a z;L-%lcV5SDu^c&OR<{OhB0lf!fymPo{6L}>T2AEu3yz_v{TV9j)mt<*^<<9|X3yMz YQO46lW4~Bn^f<6`$f=y;KBgQ00DB4eo&W#< delta 848 zcmZvadq~q!6vub(?&e(PW7;HK=+AfdTBSh}W-&60z`>{xGfgwoG&LU)fm15Vq=zSo zOkG^l9%jy65j8Or|0wDY?Li_21qKPL74=UKUFW9-5gzz(&bhyH@44suyVenAwK97F z)jT_2xTfa?i4kSAlaOGDU|}Qzl3CQoaD_q1udB zQ!dI=YE(Rp^1X~_Q%8EeTGZ#|6Q08yrG&z0v0elgO%q2Up@N)rEBO)1tqiIxfgmYU^-Ne{85#fVrg;`WkLPa?@>SZM+Eywh{<&#)12K3D`cyVtxzbHh6Cff}zGe z;Og*$T%G{$YS+R2uQ4L+%r>(4DV`O8$UYg&HD)l|_JgYBC(|lS&5$`z44?bfLe+p7 zd?&uaxz}D`Ztdh}8NbVb?2LhoYA>)?Xhou9m~j9&ZvYHeY%~V0bE8M31-#d~gMb6?Lx&e@yum_W#85)7oIH zHWKU)O^|2~6}6+KO5tq!PCS~4Dc%@w1Zl$M8Hx?_5!0MfPuf#K*N}(PtX@zRX|h@` zKeE5J1%o8S)HWxAq1zk!x{@HH!2pKt?5l1MvR=Cqzi*Oj_*_lLTj!D;n9f_&&~6N( z5EFc9I<}y$Es~SU3i>ivR!s diff --git a/Azure File Storage.js b/Azure File Storage.js index cab5ac8be..ece5ee696 100644 --- a/Azure File Storage.js +++ b/Azure File Storage.js @@ -15,7 +15,7 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { const DEBUG_MODULE = require('./Debug Log'); const logger = DEBUG_MODULE.newDebugLog(); - logger.fileName = MODULE_NAME; + logger.pFileName = MODULE_NAME; logger.bot = bot; const shareName = 'data'; @@ -70,112 +70,113 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { } } - function createFolder(folderPath, callBackFunction) { + function createFolder(pFolderPath, callBackFunction) { + + if (LOG_INFO === true) { logger.write("[INFO] initialize -> Entering function."); } if (fileService === undefined) { - const logText = "[ERROR] initialize function not executed or failed. Can not process this request. Sorry."; - logger.write(logText); + logger.write("[ERROR] createFolder -> initialize function not executed or failed. Can not process this request. Sorry."); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } try { - fileService.createDirectoryIfNotExists(shareName, folderPath, onFolderCreated); + fileService.createDirectoryIfNotExists(shareName, pFolderPath, onFolderCreated); function onFolderCreated(err) { if (err) { - - const logText = "[ERROR] createFolder - onFolderCreated ' ERROR = " + err.message + " SHARE NAME = " + shareName + " FOLDER PATH = " + folderPath; - console.log(logText); - logger.write(logText); - + logger.write("[ERROR] createFolder -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] createFolder -> onFolderCreated -> shareName = " + shareName); + logger.write("[ERROR] createFolder -> onFolderCreated -> pFolderPath = " + pFolderPath); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); + return; } - - callBackFunction(); - + callBackFunction(global.DEFAULT_OK_RESPONSE); } - } catch (err) { - const logText = "[ERROR] 'createFolder' - ERROR : " + err.message; - logger.write(logText); + logger.write("[ERROR] createFolder -> err = " + err.message); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } - } - function createTextFile(folderPath, fileName, fileContent, callBackFunction) { + function createTextFile(pFolderPath, pFileName, pFileContent, callBackFunction) { if (fileService === undefined) { - logger.write("[ERROR] initialize function not executed or failed. Can not process this request. Sorry."); + logger.write("[ERROR] createFolder -> initialize function not executed or failed. Can not process this request. Sorry."); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } try { if (FULL_LOG === true) { - - logger.write("[INFO] createTextFile about to createFileFromText here:"); - logger.write("[INFO] SHARE NAME = " + shareName + " FOLDER PATH = " + folderPath + " FILE NAME = " + fileName); - + logger.write("[INFO] createTextFile -> About to create a text file."); + logger.write("[INFO] createTextFile -> shareName = " + shareName); + logger.write("[INFO] createTextFile -> pFolderPath = " + pFolderPath); + logger.write("[INFO] createTextFile -> pFileName = " + pFileName); } - fileService.createFileFromText(shareName, folderPath, fileName, fileContent, onFileCreated); + fileService.createFileFromText(shareName, pFolderPath, pFileName, pFileContent, onFileCreated); function onFileCreated(err, result, response) { if (FULL_LOG === true) { - - logger.write("[INFO] SHARE NAME = " + shareName + " FOLDER PATH = " + folderPath + " FILE NAME = " + fileName); - logger.write("[INFO] createTextFile - onFileCreated: err = " + JSON.stringify(err)); - logger.write("[INFO] createTextFile - onFileCreated: result = " + JSON.stringify(result)); - logger.write("[INFO] createTextFile - onFileCreated: response = " + JSON.stringify(response)); - + logger.write("[INFO] createTextFile -> onFileCreated -> Response from Azure received."); + logger.write("[INFO] createTextFile -> onFileCreated -> err = " + JSON.stringify(err)); + logger.write("[INFO] createTextFile -> onFileCreated -> result = " + JSON.stringify(result)); + logger.write("[INFO] createTextFile -> onFileCreated -> response = " + JSON.stringify(response)); } if (err) { - logger.write("[ERR] createTextFile - onFileCreated: err = " + JSON.stringify(err)); - logger.write("[ERR] createTextFile - onFileCreated: result = " + JSON.stringify(result)); - logger.write("[ERR] createTextFile - onFileCreated: response = " + JSON.stringify(response)); + logger.write("[ERROR] createTextFile -> onFileCreated -> err = " + JSON.stringify(err)); + logger.write("[ERROR] createTextFile -> onFileCreated -> result = " + JSON.stringify(result)); + logger.write("[ERROR] createTextFile -> onFileCreated -> response = " + JSON.stringify(response)); if (err.message.indexOf("The server is busy") > 0) { - fileService.createFileFromText(shareName, folderPath, fileName, fileContent, onFileCreatedSecondTry); + setTimeout(secondTry, 1000); - function onFileCreatedSecondTry(err) { + function secondTry() { - if (err) { + logger.write("[INFO] createTextFile -> onFileCreated -> secondTry -> Retrying to create the file."); - logger.write("[ERR] createTextFile - onFileCreated - onFileCreatedSecondTry : File not created. Giving Up. "); + fileService.createFileFromText(shareName, pFolderPath, pFileName, pFileContent, onFileCreatedSecondTry); - } else { - - logger.write("[INFO] createTextFile - onFileCreated - onFileCreatedSecondTry : File succesfully created on second try. "); - logger.write("[INFO] SHARE NAME = " + shareName + " FOLDER PATH = " + folderPath + " FILE NAME = " + fileName); + function onFileCreatedSecondTry(err) { + if (err) { + logger.write("[ERROR] createTextFile -> onFileCreated -> secondTry -> File not created. Giving Up."); + callBackFunction(global.DEFAULT_RETRY_RESPONSE); + } else { + logger.write("[INFO] createTextFile -> onFileCreated -> secondTry -> File succesfully created on second try."); + callBackFunction(global.DEFAULT_OK_RESPONSE); + } } } } - callBackFunction(false); + logger.write("[ERROR] createTextFile -> onFileCreated -> Dont know what to do here. Cancelling operation. "); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } else { - - callBackFunction(true); - + if (LOG_INFO === true) { logger.write("[INFO] createTextFile -> onFileCreated -> File Created."); } + callBackFunction(global.DEFAULT_OK_RESPONSE); } } } catch (err) { logger.write("[ERROR] 'createTextFile' - ERROR : " + JSON.stringify(err)); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); } - } - function getTextFile(folderPath, fileName, callBackFunction, ignoreNotFound) { + function getTextFile(pFolderPath, pFileName, callBackFunction, ignoreNotFound) { if (fileService === undefined) { @@ -186,7 +187,7 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { try { - fileService.getFileToText(shareName, folderPath, fileName, undefined, onFileReceived); + fileService.getFileToText(shareName, pFolderPath, pFileName, undefined, onFileReceived); function onFileReceived(err, text, response) { @@ -194,7 +195,7 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { if (ignoreNotFound === undefined) { - const logText = "[ERROR] getTextFile - onFileReceived ' ERROR = " + err.message + " SHARE NAME = " + shareName + " FOLDER PATH = " + folderPath + " FILE NAME = " + fileName; + const logText = "[ERROR] getTextFile - onFileReceived ' ERROR = " + err.message + " SHARE NAME = " + shareName + " FOLDER PATH = " + pFolderPath + " FILE NAME = " + pFileName; console.log(logText); logger.write(logText); @@ -215,7 +216,7 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { } - function listFilesAndFolders(folderPath, callBackFunction) { + function listFilesAndFolders(pFolderPath, callBackFunction) { if (fileService === undefined) { @@ -249,7 +250,7 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { maxResults: 500 }; - fileService.listFilesAndDirectoriesSegmented(shareName, folderPath, null, options, onFilesAndFoldersReceived); + fileService.listFilesAndDirectoriesSegmented(shareName, pFolderPath, null, options, onFilesAndFoldersReceived); function onFilesAndFoldersReceived(error, result) { @@ -273,6 +274,8 @@ exports.newAzureFileStorage = function newAzureFileStorage(BOT) { } } + + catch (err) { const logText = "[ERROR] 'listFilesAndFolders - onFilesAndFoldersReceived' - ERROR : " + err.message; logger.write(logText); diff --git a/Run.js b/Run.js index dba394ec0..5a23a5921 100644 --- a/Run.js +++ b/Run.js @@ -211,15 +211,15 @@ function runTradingBot(pProcessConfig) { } else { - logger.write("[ERR] trading bot -> onInitializeReady -> whenStartFinishes -> err = " + err.message); - logger.write("[ERR] trading bot -> onInitializeReady -> whenStartFinishes -> Execution will be stopped. "); - logger.write("[ERR] trading bot -> onInitializeReady -> whenStartFinishes -> Bye. :-("); + logger.write("[ERROR] trading bot -> onInitializeReady -> whenStartFinishes -> err = " + err.message); + logger.write("[ERROR] trading bot -> onInitializeReady -> whenStartFinishes -> Execution will be stopped. "); + logger.write("[ERROR] trading bot -> onInitializeReady -> whenStartFinishes -> Bye. :-("); } } } else { - logger.write("[ERR] trading bot -> onInitializeReady -> err = " + err.message); - logger.write("[ERR] trading bot -> onInitializeReady -> Bot will not be started. "); + logger.write("[ERROR] trading bot -> onInitializeReady -> err = " + err.message); + logger.write("[ERROR] trading bot -> onInitializeReady -> Bot will not be started. "); } } }