From cbd5b794ef4ecf76446bda434497b2cacd9ec03e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 5 Mar 2018 03:21:33 +0100 Subject: [PATCH] new config --- .vs/AAMariam-Trading-Bot/v15/.suo | Bin 0 -> 26624 bytes AAMariam.sln => AAMariam-Trading-Bot.sln | 2 +- AAMariam.njsproj => Project.njsproj | 2 +- Trading-Process/Interval.js | 2 +- this.bot.config.json | 37 +++++++++++++++++++++-- 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 .vs/AAMariam-Trading-Bot/v15/.suo rename AAMariam.sln => AAMariam-Trading-Bot.sln (88%) rename AAMariam.njsproj => Project.njsproj (99%) diff --git a/.vs/AAMariam-Trading-Bot/v15/.suo b/.vs/AAMariam-Trading-Bot/v15/.suo new file mode 100644 index 0000000000000000000000000000000000000000..28859c201652b4b3e09b39739f41c6101fbe2e4c GIT binary patch literal 26624 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 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - AAMariam + Project diff --git a/Trading-Process/Interval.js b/Trading-Process/Interval.js index 55966fa87..8072dd9c0 100644 --- a/Trading-Process/Interval.js +++ b/Trading-Process/Interval.js @@ -1362,7 +1362,7 @@ if (err || exchangeResponse.error !== undefined) { try { - if (err.message.indexOf("ETIMEDOUT") > 0) { + if (err.message.indexOf("ETIMEDOUT") > 0 || err.message.indexOf("Order execution timed out") > 0) { const logText = "[WARN] movePositionAtExchange - onExchangeCallReturned - Timeout reached while trying to access the Exchange API. Requesting new execution later. : ERROR = " + err.message; logger.write(logText); diff --git a/this.bot.config.json b/this.bot.config.json index 061f71795..9344e28cd 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -1,9 +1,10 @@ { "bot": { - "name": "Mariam", + "displayName": "Mariam", + "codeName": "AAMariam", "type": "Trading", "version": "1.0.0", - "devTeam": "AA Masters", + "devTeam": "AAMasters", "dataSetVersion": "dataSet.V1" }, "processes": [ @@ -28,7 +29,37 @@ "intervalLapse": 60000, "intervalMaxLoops": -1 } - ] + ], + "products": [ + { + "codeName": "Trading History", + "displayName": "Mariam Trading History", + "description": "General information about Mariam trading history.", + "storageAccount": "aamariam", + "sets": [ + { + "type": "Single File", + "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs", "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ], + "filePath": "@Exchange/Mariam/dataSet.V1/Output/Trading-Process", + "fileName": "Execution.History.json" + } + ], + "exchangeList": [ + { + "name": "Poloniex" + } + ], + "plotter": { + "devTeam": "AAMasters", + "repo": "Plotters-Trading", + "moduleName": "History" + } + } + ], + "storage": { + "sas": "?sv=2017-07-29&ss=f&srt=sco&sp=r&se=2018-12-30T23:44:52Z&st=2018-02-25T15:44:52Z&spr=https&sig=0pzOTcVAAOkgH7C4KmA1Rbs15kyjvVC1XFCsLQYjXKU%3D", + "fileUri": "https://aamariam.file.core.windows.net" + } }