Merge pull request #20 from UdjinM6/master

enabled:true seems more natural than disabled:false in poolOptions
This commit is contained in:
Matthew Little 2014-03-28 11:33:19 -06:00
commit 2e79bc098d
8 changed files with 9 additions and 9 deletions

View File

@ -75,7 +75,7 @@ var buildPoolConfigs = function(){
var configs = {}; var configs = {};
fs.readdirSync('pool_configs').forEach(function(file){ fs.readdirSync('pool_configs').forEach(function(file){
var poolOptions = JSON.parse(JSON.minify(fs.readFileSync('pool_configs/' + file, {encoding: 'utf8'}))); var poolOptions = JSON.parse(JSON.minify(fs.readFileSync('pool_configs/' + file, {encoding: 'utf8'})));
if (poolOptions.disabled) return; if (!poolOptions.enabled) return;
var coinFilePath = 'coins/' + poolOptions.coin; var coinFilePath = 'coins/' + poolOptions.coin;
if (!fs.existsSync(coinFilePath)){ if (!fs.existsSync(coinFilePath)){
logger.error('Master', poolOptions.coin, 'could not find file: ' + coinFilePath); logger.error('Master', poolOptions.coin, 'could not find file: ' + coinFilePath);
@ -193,7 +193,7 @@ var startPaymentProcessor = function(poolConfigs){
var enabledForAny = false; var enabledForAny = false;
for (var pool in poolConfigs){ for (var pool in poolConfigs){
var p = poolConfigs[pool]; var p = poolConfigs[pool];
var enabled = !p.disabled && p.shareProcessing && p.shareProcessing.internal && p.shareProcessing.internal.enabled; var enabled = p.enabled && p.shareProcessing && p.shareProcessing.internal && p.shareProcessing.internal.enabled;
if (enabled){ if (enabled){
enabledForAny = true; enabledForAny = true;
break; break;

View File

@ -191,7 +191,7 @@ function SetupForPool(logger, poolOptions){
} }
else if (tx.error || !tx.result){ else if (tx.error || !tx.result){
logger.error(logSystem, logComponent, logger.error(logSystem, logComponent,
'error with requesting transaction from block daemon: ' + JSON.stringify(tx)); 'Error with requesting transaction from block daemon: ' + JSON.stringify(tx));
} }
else{ else{
round.category = tx.result.details[0].category; round.category = tx.result.details[0].category;

View File

@ -1,5 +1,5 @@
{ {
"disabled": true, "enabled": false,
"coin": "darkcoin.json", "coin": "darkcoin.json",
"shareProcessing": { "shareProcessing": {

View File

@ -1,5 +1,5 @@
{ {
"disabled": true, "enabled": false,
"coin": "galleon.json", "coin": "galleon.json",
"address": "GRAiuGCWLrL8Psdr6pkhLpxrQGHdYfrSEz", "address": "GRAiuGCWLrL8Psdr6pkhLpxrQGHdYfrSEz",

View File

@ -1,5 +1,5 @@
{ {
"disabled": true, "enabled": false,
"coin": "helixcoin.json", "coin": "helixcoin.json",
"shareProcessing": { "shareProcessing": {

View File

@ -1,5 +1,5 @@
{ {
"disabled": true, "enabled": false,
"coin": "hirocoin.json", "coin": "hirocoin.json",
"shareProcessing": { "shareProcessing": {

View File

@ -1,5 +1,5 @@
{ {
"disabled": true, "enabled": false,
"coin": "hobonickels.json", "coin": "hobonickels.json",
"shareProcessing": { "shareProcessing": {

View File

@ -1,5 +1,5 @@
{ {
"disabled": false, "enabled": false,
"coin": "litecoin.json", "coin": "litecoin.json",
"shareProcessing": { "shareProcessing": {