From c3a15ad200d6e5095931af06af48e43a31676e6b Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 6 May 2014 20:30:31 -0600 Subject: [PATCH] Updated to support slightly different logging implemented while doing new Darkcoin masternode features --- libs/paymentProcessor.js | 4 +++- libs/profitSwitch.js | 7 +++---- libs/website.js | 6 ++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/paymentProcessor.js b/libs/paymentProcessor.js index 1e48e49..ecffef6 100644 --- a/libs/paymentProcessor.js +++ b/libs/paymentProcessor.js @@ -49,7 +49,9 @@ function SetupForPool(logger, poolOptions, setupFinished){ var logSystem = 'Payments'; var logComponent = coin; - var daemon = new Stratum.daemon.interface([processingConfig.daemon]); + var daemon = new Stratum.daemon.interface([processingConfig.daemon], function(severity, message){ + logger[severity](logSystem, logComponent, message); + }); var redisClient = redis.createClient(poolOptions.redis.port, poolOptions.redis.host); var magnitude; diff --git a/libs/profitSwitch.js b/libs/profitSwitch.js index 9836f2f..5650ffa 100644 --- a/libs/profitSwitch.js +++ b/libs/profitSwitch.js @@ -419,11 +419,10 @@ module.exports = function(logger){ }); }; this.getDaemonInfoForCoin = function(symbol, cfg, callback){ - var daemon = new Stratum.daemon.interface([cfg]); - daemon.on('error', function(error){ - logger.error(logSystem, symbol, JSON.stringify(error)); + var daemon = new Stratum.daemon.interface([cfg], function(severity, message){ + logger[severity](logSystem, symbol, message); callback(null); // fail gracefully for each coin - }).init(); + }); daemon.cmd('getblocktemplate', [{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ]}], function(result) { if (result[0].error != null) { diff --git a/libs/website.js b/libs/website.js index 500428b..6db3ed4 100644 --- a/libs/website.js +++ b/libs/website.js @@ -156,10 +156,12 @@ module.exports = function(logger){ } } })(); - var daemon = new Stratum.daemon.interface([coinInfo.daemon]); + var daemon = new Stratum.daemon.interface([coinInfo.daemon], function(severity, message){ + logger[severity](logSystem, c, message); + }); daemon.cmd('dumpprivkey', [coinInfo.address], function(result){ if (result[0].error){ - logger.error(logSystem, 'daemon', 'Could not dumpprivkey for ' + c + ' ' + JSON.stringify(result[0].error)); + logger.error(logSystem, c, 'Could not dumpprivkey for ' + c + ' ' + JSON.stringify(result[0].error)); cback(); return; }