From 7e558fe96f98857f0f49096d52bc5db05a5f1332 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 5 Jun 2018 21:35:27 +0200 Subject: [PATCH] Elimination Create Folders --- Poloniex-Hole-Fixing/User.bot.js | 45 +++++++----------------- Poloniex-Live-Trades/User.bot.js | 60 +++++++------------------------- 2 files changed, 26 insertions(+), 79 deletions(-) diff --git a/Poloniex-Hole-Fixing/User.bot.js b/Poloniex-Hole-Fixing/User.bot.js index 33265f2fb..7cc90cd4e 100644 --- a/Poloniex-Hole-Fixing/User.bot.js +++ b/Poloniex-Hole-Fixing/User.bot.js @@ -1092,51 +1092,32 @@ What is the lastFile pointer? filePath = bot.filePathRoot + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPath; - utilities.createFolderIfNeeded(filePath, charlyStorage, onFolderCreated); + charlyStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFolderCreated(err) { + function onFileCreated(err) { try { - if (FULL_LOG === true) { logger.write("[INFO] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> Entering function."); } if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> err = " + err.message); callBackFunction(err); return; } - charlyStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - - function onFileCreated(err) { - - try { - - if (FULL_LOG === true) { logger.write("[INFO] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> onFileCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); - } - - logger.write("[WARN] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounter + " records inserted into " + filePath + "/" + fileName + ""); - - controlLoop(); - - } catch (err) { - logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> onFileCreated -> err = " + err.message); - callBackFunction(global.DEFAULT_FAIL_RESPONSE); - return; - } + if (LOG_FILE_CONTENT === true) { + logger.write("[INFO] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> Content written = " + fileContent); } + logger.write("[WARN] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> Finished with File @ " + market.assetA + "_" + market.assetB); + logger.write("[WARN] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> Records inserted = " + fileRecordCounter); + logger.write("[WARN] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> Path = " + filePath + "/" + fileName + ""); + + controlLoop(); + } catch (err) { - logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFolderCreated -> err = " + err.message); + logger.write("[ERROR] start -> tradesReadyToBeSaved -> nextRecord -> onFileCreated -> err = " + err.message); callBackFunction(global.DEFAULT_FAIL_RESPONSE); return; } diff --git a/Poloniex-Live-Trades/User.bot.js b/Poloniex-Live-Trades/User.bot.js index f77f469d6..90888471b 100644 --- a/Poloniex-Live-Trades/User.bot.js +++ b/Poloniex-Live-Trades/User.bot.js @@ -111,13 +111,13 @@ Array of records with this information: let exchangeCallTime; - createFolders(); + firstSteps(); - function createFolders() { + function firstSteps() { try { - if (FULL_LOG === true) { logger.write("[INFO] start -> createFolders -> Entering function."); } + if (FULL_LOG === true) { logger.write("[INFO] start -> firstSteps -> Entering function."); } currentDate = bot.processDatetime; @@ -129,48 +129,10 @@ Array of records with this information: filePathA = bot.filePathRoot + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPathA; filePathB = bot.filePathRoot + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPathB; - utilities.createFolderIfNeeded(filePathA, charlyStorage, onFolderACreated); - - function onFolderACreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> createFolders -> onFolderACreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> createFolders -> onFolderACreated -> err = " + err.message); - callBackFunction(err); - return; - } - - utilities.createFolderIfNeeded(filePathB, charlyStorage, onFolderBCreated); - } - - function onFolderBCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> createFolders -> onFolderBCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> createFolders -> onFolderBCreated -> err = " + err.message); - callBackFunction(err); - return; - } - - utilities.createFolderIfNeeded(reportFilePath, charlyStorage, onFolderCreated); - } - - function onFolderCreated(err) { - - if (FULL_LOG === true) { logger.write("[INFO] start -> createFolders -> onFolderCreated -> Entering function."); } - - if (err.result !== global.DEFAULT_OK_RESPONSE.result) { - logger.write("[ERROR] start -> createFolders -> onFolderCreated -> err = " + err.message); - callBackFunction(err); - return; - } - getTheTrades(); - } + getTheTrades(); } catch (err) { - logger.write("[ERROR] start -> createFolders -> err = " + err.message); + logger.write("[ERROR] start -> firstSteps -> err = " + err.message); callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } @@ -298,10 +260,12 @@ Array of records with this information: } if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> writeFiles -> writeVolumes -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); + logger.write("[INFO] start -> tradesReadyToBeSaved -> onFirstFileACreated -> Content written = " + fileContent); } - logger.write("[WARN] start -> tradesReadyToBeSaved -> onFirstFileACreated -> Finished with File A @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounterA + " records inserted into " + filePathA + "/" + fileNameA + ""); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFirstFileACreated -> Finished with File A @ " + market.assetA + "_" + market.assetB); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFirstFileACreated -> Records inserted = " + fileRecordCounterA); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFirstFileACreated -> Path = " + filePathA + "/" + fileNameA + ""); generateFileB(); } @@ -363,10 +327,12 @@ Array of records with this information: } if (LOG_FILE_CONTENT === true) { - logger.write("[INFO] start -> tradesReadyToBeSaved -> onFileBCreated -> Content written = " + fileContent); + logger.write("[INFO] start -> tradesReadyToBeSaved -> onFileBCreated -> Content written = " + fileContent); } - logger.write("[WARN] start -> tradesReadyToBeSaved -> onFileBCreated -> Finished with File B @ " + market.assetA + "_" + market.assetB + ", " + fileRecordCounterB + " records inserted into " + filePathB + "/" + fileNameB + ""); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFileBCreated -> Finished with File B @ " + market.assetA + "_" + market.assetB); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFileBCreated -> Content written -> Records inserted = " + fileRecordCounterB); + logger.write("[WARN] start -> tradesReadyToBeSaved -> onFileBCreated -> Content written -> Path = " + filePathB + "/" + fileNameB + ""); writeStatusReport(); }