diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo
index 187fc7dd4..1ba82e664 100644
Binary files a/.vs/AACloudPlatform/v15/.suo and b/.vs/AACloudPlatform/v15/.suo differ
diff --git a/Context.js b/Context.js
index 973832718..baf5f1243 100644
--- a/Context.js
+++ b/Context.js
@@ -120,19 +120,20 @@
callBackFunction(global.DEFAULT_OK_RESPONSE);
return;
}
- break;
case global.DEFAULT_RETRY_RESPONSE.result: { // Something bad happened, but if we retry in a while it might go through the next time.
logger.write("[ERROR] initialize -> onDone -> Retry Later. Requesting Execution Retry.");
callBackFunction(err);
return;
}
- break;
case global.DEFAULT_FAIL_RESPONSE.result: { // This is an unexpected exception that we do not know how to handle.
logger.write("[ERROR] initialize -> onDone -> Operation Failed. Aborting the process.");
callBackFunction(err);
return;
}
- break;
+ default: {
+ logger.write("[ERROR] initialize -> onDone -> Operation Failed with custom response.");
+ callBackFunction(err);
+ }
}
} catch (err) {
@@ -191,7 +192,7 @@
if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> Entering function."); }
let fileName = "Execution.History.json"
- let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor;
+ let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process;
if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> fileName = " + fileName); }
if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionHistory -> filePath = " + filePath); }
@@ -252,7 +253,7 @@
let fileName = "Execution.Context.json"
let dateForPath = date.getUTCFullYear() + '/' + utilities.pad(date.getUTCMonth() + 1, 2) + '/' + utilities.pad(date.getUTCDate(), 2) + '/' + utilities.pad(date.getUTCHours(), 2) + '/' + utilities.pad(date.getUTCMinutes(), 2);
- let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + dateForPath;
+ let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process + '/' + dateForPath;
if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> fileName = " + fileName); }
if (FULL_LOG === true) { logger.write("[INFO] initialize -> getExecutionContext -> filePath = " + filePath); }
@@ -412,7 +413,7 @@
let fileName = "Execution.Context.json"
let dateForPath = global.processDatetime.getUTCFullYear() + '/' + utilities.pad(global.processDatetime.getUTCMonth() + 1, 2) + '/' + utilities.pad(global.processDatetime.getUTCDate(), 2) + '/' + utilities.pad(global.processDatetime.getUTCHours(), 2) + '/' + utilities.pad(global.processDatetime.getUTCMinutes(), 2);
- let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor + "/" + dateForPath;
+ let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process + '/' + dateForPath;
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> fileName = " + fileName); }
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExecutionContext -> filePath = " + filePath); }
@@ -472,7 +473,7 @@
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> Entering function."); }
let fileName = "Execution.History.json"
- let filePath = bot.devTeam + "/" + bot.codeName + "." + bot.version.major + "." + bot.version.minor + "/" + bot.dataSetVersion + "/Output/" + bot.process + "/" + global.PLATFORM_CONFIG.codeName + "." + global.PLATFORM_CONFIG.version.major + "." + global.PLATFORM_CONFIG.version.minor;
+ let filePath = global.FILE_PATH_ROOT + "/Output/" + bot.process;
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> fileName = " + fileName); }
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeExucutionHistory -> filePath = " + filePath); }
@@ -547,7 +548,7 @@
if (FULL_LOG === true) { logger.write("[INFO] saveThemAll -> writeStatusReport -> Entering function."); }
- thisObject.statusReport.lastExecution = global.processDatetime;
+ statusReportModule.file.lastExecution = global.processDatetime;
statusReportModule.save(callBack);
}
diff --git a/Project.njsproj b/Project.njsproj
index 85a2f27ea..a46d74930 100644
--- a/Project.njsproj
+++ b/Project.njsproj
@@ -13,7 +13,7 @@
14.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
Project
- Multi-Period-Market
+ Trading-Process
C:\Program Files\nodejs\node.exe
False
diff --git a/Run.js b/Run.js
index 923e3625b..ddcc3e6b0 100644
--- a/Run.js
+++ b/Run.js
@@ -3,7 +3,7 @@ const FULL_LOG = true;
/* The following global variable tells the system if it is running on test mode or production. */
-global.RUNNING_MODE = 'Mixed'; // 'Testnet' or 'Production'
+global.RUNNING_MODE = 'Production'; // 'Testnet' or 'Production'
/* First thing to do is to read the config and guess which bot we will be running. */
diff --git a/platform.config.json b/platform.config.json
index 9b6050224..53b059787 100644
--- a/platform.config.json
+++ b/platform.config.json
@@ -2,11 +2,11 @@
"codeName": "AACloud",
"version": {
"major": 1,
- "minor": 0,
- "patch": 1
+ "minor": 1,
+ "patch": 0
},
"bot": {
- "path": "../Bots/AAMasters/AAOlivia-Indicator-Bot"
+ "path": "../Bots/AAMasters/AAMariam-Trading-Bot"
},
"stopGracefully": "false"
}
\ No newline at end of file