Fixed errors that occurred when certain modules were not configured/enabled.

This commit is contained in:
Matthew Little 2014-03-26 15:08:34 -06:00
parent 572a5ea45b
commit 609eb0ae90
7 changed files with 49 additions and 96 deletions

6
coins/helixcoin.json Normal file
View File

@ -0,0 +1,6 @@
{
"name" : "Helixcoin",
"symbol" : "HXC",
"algorithm" : "keccak",
"txMessages" : false
}

6
coins/wecoin.json Normal file
View File

@ -0,0 +1,6 @@
{
"name" : "Wecoin",
"symbol" : "WEC",
"algorithm" : "keccak",
"txMessages" : false
}

14
init.js
View File

@ -179,6 +179,20 @@ var startRedisBlockListener = function(portalConfig){
var startPaymentProcessor = function(poolConfigs){
var enabledForAny = false;
for (var pool in poolConfigs){
var p = poolConfigs[pool];
var enabled = p.shareProcessing && p.shareProcessing.internal && p.shareProcessing.internal.enabled;
if (enabled){
enabledForAny = true;
break;
}
}
if (!enabledForAny)
return;
var worker = cluster.fork({
workerType: 'paymentProcessor',
pools: JSON.stringify(poolConfigs)

View File

@ -19,11 +19,16 @@ module.exports = function(logger){
function SetupForPool(logger, poolOptions){
var coin = poolOptions.coin.name;
if (!poolOptions.shareProcessing ||
poolOptions.shareProcessing.internal ||
!poolOptions.shareProcessing.internal.enabled)
return;
var coin = poolOptions.coin.name;
var processingConfig = poolOptions.shareProcessing.internal;
if (!processingConfig.enabled) return;
var logSystem = 'Payments';
var logComponent = coin;

View File

@ -64,7 +64,7 @@ module.exports = function(logger){
var shareProcessing = poolOptions.shareProcessing;
//Functions required for MPOS compatibility
if (shareProcessing.mpos && shareProcessing.mpos.enabled){
if (shareProcessing && shareProcessing.mpos && shareProcessing.mpos.enabled){
var mposCompat = new MposCompatibility(logger, poolOptions)
handlers.auth = function(workerName, password, authCallback){
@ -81,7 +81,7 @@ module.exports = function(logger){
}
//Functions required for internal payment processing
else if (shareProcessing.internal && shareProcessing.internal.enabled){
else if (shareProcessing && shareProcessing.internal && shareProcessing.internal.enabled){
var shareProcessor = new ShareProcessor(logger, poolOptions)

View File

@ -8,6 +8,8 @@ module.exports = function(logger, portalConfig, poolConfigs){
var _this = this;
var logSystem = 'Stats';
var redisClients = [];
var algoMultipliers = {
@ -17,8 +19,20 @@ module.exports = function(logger, portalConfig, poolConfigs){
'sha256': Math.pow(2, 32)
};
var canDoStats = true;
Object.keys(poolConfigs).forEach(function(coin){
if (!canDoStats) return;
var poolConfig = poolConfigs[coin];
if (!poolConfig.shareProcessing || !poolConfig.shareProcessing.internal){
logger.error(logSystem, coin, 'Cannot do stats without internal share processing setup');
canDoStats = false;
return;
}
var internalConfig = poolConfig.shareProcessing.internal;
var redisConfig = internalConfig.redis;

View File

@ -1,92 +0,0 @@
{
"disabled": false,
"coin": "litecoin.json",
"shareProcessing": {
"internal": {
"enabled": true,
"validateWorkerAddress": true,
"paymentInterval": 10,
"minimumPayment": 100.001,
"minimumReserve": 10,
"feePercent": 0.02,
"feeReceiveAddress": "LZz44iyF4zLCXJTU8RxztyyJZBntdS6fvv",
"feeWithdrawalThreshold": 5,
"daemon": {
"host": "localhost",
"port": 19332,
"user": "litecoinrpc",
"password": "testnet"
},
"redis": {
"host": "localhost",
"port": 6379
}
},
"mpos": {
"enabled": false,
"host": "localhost",
"port": 3306,
"user": "me",
"password": "mypass",
"database": "ltc",
"stratumAuth": "password"
}
},
"address": "mfsm1ckZKTTjDz94KonZZsbZnAbm1UV4BF",
"blockRefreshInterval": 1000,
"txRefreshInterval": 20000,
"connectionTimeout": 600,
"banning": {
"enabled": true,
"time": 600,
"invalidPercent": 50,
"checkThreshold": 500,
"purgeInterval": 300
},
"ports": {
"3008":{
"diff": 8,
"varDiff": {
"minDiff": 8,
"maxDiff": 512,
"targetTime": 15,
"retargetTime": 90,
"variancePercent": 30
}
},
"3032": {
"diff": 16
},
"3256": {
"diff": 256
}
},
"daemons": [
{
"host": "localhost",
"port": 19332,
"user": "litecoinrpc",
"password": "testnet"
},
{
"host": "localhost",
"port": 19344,
"user": "litecoinrpc",
"password": "testnet"
}
],
"p2p": {
"enabled": false,
"host": "localhost",
"port": 19333,
"protocolVersion": 70002,
"magic": "fcc1b7dc"
}
}