Logging IMproved

This commit is contained in:
Luis Fernando Molina committed 2020-09-02 17:31:50 +02:00
1 parent ee641865bd
commit ac7890b13a
3 files changed
+24 -13

No files matched your search

+9 -3
View File
@@ -50,11 +50,11 @@
async function getOrder(tradingSystemOrder, tradingEngineOrder) {
let orderId = tradingEngineOrder.exchangeId.value
const symbol = bot.market.baseAsset + '/' + bot.market.quotedAsset
/* Basic Logging */
logInfo("getOrder -> Entering function. orderId = " + orderId);
const symbol = bot.market.baseAsset + '/' + bot.market.quotedAsset
logInfo("getOrder -> orderId = " + orderId)
logInfo("getOrder -> symbol = " + symbol)
/* Basic Validations */
if (exchange.has['fetchOrder'] === false) {
@@ -64,6 +64,8 @@
try {
let order = await exchange.fetchOrder(orderId, symbol)
logInfo("getOrder -> Response from the Exchange: " + JSON.stringify(order));
return order
} catch (err) {
tradingSystem.errors.push([tradingSystemOrder.id, "getOrder -> Error = " + err.message])
@@ -121,6 +123,8 @@
try {
let order = await (exchange.createOrder(symbol, type, side, amount, price))
logInfo("createOrder -> Response from the Exchange: " + JSON.stringify(order));
return order.id
} catch (err) {
tradingSystem.errors.push([tradingSystemOrder.id, "createOrder -> Error = " + err.message])
@@ -145,6 +149,8 @@
try {
let order = await exchange.cancelOrder(orderId, symbol)
logInfo("cancelOrder -> Response from the Exchange: " + JSON.stringify(order));
return true
} catch (err) {
tradingSystem.errors.push([tradingSystemOrder.id, "cancelOrder -> Error = " + err.message])
+14 -9
View File
@@ -129,7 +129,7 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM
*/
if (tradingSystemOrder.config.spawnMultipleOrders !== true) {
if (tradingEngineOrder.lock.value === 'Closed') {
tradingSystem.infos.push('Order ' + tradingSystemOrder.name + ' skipped because lock was closed.')
tradingSystem.infos.push(['Order ' + tradingSystemOrder.name + ' skipped because lock was closed.'])
continue
}
}
@@ -158,7 +158,9 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM
For some reason we could not check the order at the exchange, so we will not even check if we
need to cancel it, since we could end up with inconsisten information at the accounting level.
*/
tradingSystem.warnings.push(tradingSystemOrder.id, 'Skipping Cancel Event Checking because cheking the Exchange Events failed.')
if (tradingSystemOrder.cancelOrderEvent !== undefined) {
tradingSystem.warnings.push([tradingSystemOrder.cancelOrderEvent.id, 'Skipping Cancel Event Checking because cheking the order at the exchange failed.'])
}
return
}
@@ -246,16 +248,16 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM
await calculateOrderSize()
/* Check Size: We are not going to create Orders which size is equal or less to zero. */
if (tradingEngineOrder.orderBaseAsset.size.value <= 0 || tradingEngineOrder.orderQuotedAsset.size.value <= 0) {
tradingSystem.warnings.push(tradingSystemOrder.id, 'Could not open this order because its size would be zero.')
return
if (tradingEngineOrder.orderBaseAsset.size.value <= 0 || tradingEngineOrder.orderQuotedAsset.size.value <= 0) {
tradingSystem.warnings.push([tradingSystemOrder.id, 'Could not open this order because its size would be zero.'])
return
}
/* Place Order at the Exchange, if needed. */
let result = await createOrderAtExchange(tradingSystemOrder, tradingEngineOrder)
if (result !== true) {
tradingSystem.warnings.push(tradingSystemOrder.id, 'Could not open this order because something failed placing the order at the Exchange.')
return
if (result !== true) {
tradingSystem.warnings.push([tradingSystemOrder.id, 'Could not open this order because something failed placing the order at the Exchange.'])
return
}
/* Update Stage Placed Size */
@@ -679,7 +681,10 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM
let order = await exchangeAPIModule.getOrder(tradingSystemOrder, tradingEngineOrder)
if (order === undefined) { return false }
if (order === undefined) {
tradingSystem.warnings.push([tradingSystemOrder.id, 'Could not verify the status of this order at the exchange.'])
return false
}
const AT_EXCHANGE_STATUS = {
OPEN: 'open',
+1 -1
View File
@@ -893,7 +893,7 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM
when we see at the exchange that orders were filled.
Note that the comparison is made with a Rounding Factor in order to avoid rounding problems.
*/
const ROUNDING_ERROR_CORRECTION_FACTOR = 1.0000001
const ROUNDING_ERROR_CORRECTION_FACTOR = 1.001
switch (tradingEngineStage.stageDefinedIn.value) {
case 'Base Asset': {