From d2f9be48d2733ec3107641bc1be0fc4d069bbcae Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 5 Mar 2014 15:31:32 -0700 Subject: [PATCH] Fixed some bugs with internal share processing --- libs/poolWorker.js | 2 +- libs/shareProcessor.js | 16 +++++++++++++--- pool_configs/litecoin_testnet_example.json | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libs/poolWorker.js b/libs/poolWorker.js index 067438d..7af2610 100644 --- a/libs/poolWorker.js +++ b/libs/poolWorker.js @@ -90,7 +90,7 @@ module.exports = function(logger){ var authString = authorized ? 'Authorized' : 'Unauthorized '; - poolLogger.debug('client', authorized + ' [' + ip + '] ' + workerName + ':' + password); + poolLogger.debug('client', authString + ' [' + ip + '] ' + workerName + ':' + password); callback({ error: null, authorized: authorized, diff --git a/libs/shareProcessor.js b/libs/shareProcessor.js index 8ffc7ce..081a942 100644 --- a/libs/shareProcessor.js +++ b/libs/shareProcessor.js @@ -8,13 +8,23 @@ module.exports = function(logger, poolConfig){ var connection; function connect(){ - var connection = connections[coin] = redis.createClient(redisConfig.port, redisConfig.host); + + var reconnectTimeout; + + var connection = redis.createClient(redisConfig.port, redisConfig.host); + connection.on('ready', function(){ + clearTimeout(reconnectTimeout); + logger.debug('redis', 'Successfully connected to redis database'); + }); connection.on('error', function(err){ logger.error('redis', 'Redis client had an error: ' + JSON.stringify(err)) }); connection.on('end', function(){ - logger.warning('redis', 'Connection to redis database as been ended'); - connect(); + logger.error('redis', 'Connection to redis database as been ended'); + logger.warning('redis', 'Trying reconnection in 3 seconds...'); + reconnectTimeout = setTimeout(function(){ + connect(); + }, 3000); }); } connect(); diff --git a/pool_configs/litecoin_testnet_example.json b/pool_configs/litecoin_testnet_example.json index 1c98549..892494d 100644 --- a/pool_configs/litecoin_testnet_example.json +++ b/pool_configs/litecoin_testnet_example.json @@ -22,7 +22,7 @@ "shareProcessing": { "internal": { - "enabled": false, + "enabled": true, "daemon": { "host": "localhost", "port": 19332, @@ -35,7 +35,7 @@ } }, "mpos": { - "enabled": true, + "enabled": false, "host": "localhost", "port": 3306, "user": "me",