zecfoundation
/
s-nomp
mirror of https://github.com/ZcashFoundation/s-nomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged stuff

This commit is contained in:
Andrea Baccega 2014-03-14 21:56:54 +00:00
parent 437e242a25
commit 5b3c12508e
3 changed files with 28 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
config.json
View File

@ -11,9 +11,10 @@
}, },
"redisBlockNotifyListener": { "redisBlockNotifyListener": {
"redisPort": 6379, "enabled" : false,
"redisHost": "coindaemons.ultimatecoinpool.com", "redisPort" : 6379,
"psubscribeKey": "newblocks:*" "redisHost" : "hostname",
"psubscribeKey" : "newblocks:*"
}, },
"proxy": { "proxy": {
"enabled": true, "enabled": true,
@ -21,36 +22,37 @@
"80": { "80": {
"diff": 32, "diff": 32,
"varDiff": { "varDiff": {
"minDiff": 8, "minDiff" : 8,
"maxDiff": 512, "maxDiff" : 512,
"targetTime": 15, "targetTime" : 15,
"retargetTime": 90, "retargetTime" : 90,
"variancePercent": 30 "variancePercent" : 30
} }
}, },
"6000": { "6000": {
"diff": 32, "diff": 32,
"varDiff": { "varDiff": {
"minDiff": 8, "minDiff" : 8,
"maxDiff": 512, "maxDiff" : 512,
"targetTime": 15, "targetTime" : 15,
"retargetTime": 90, "retargetTime" : 90,
"variancePercent": 30 "variancePercent" : 30
} }
}, },
"8080": { "8080": {
"diff": 32, "diff": 32,
"varDiff": { "varDiff": {
"minDiff": 8, "minDiff" : 8,
"maxDiff": 512, "maxDiff" : 512,
"targetTime": 15, "targetTime" : 15,
"retargetTime": 90, "retargetTime" : 90,
"variancePercent": 30 "variancePercent" : 30
} }
} }
} }
},
"website": { "website": {
"enabled": true, "enabled": false,
"port": 80, "port": 80,
"liveStats": true "liveStats": true
} }

27
init.js
View File

@ -3,32 +3,17 @@ var os = require('os');
var cluster = require('cluster'); var cluster = require('cluster');
<<<<<<< HEAD
var posix = require('posix'); var posix = require('posix');
var PoolLogger = require('./libs/logutils.js'); var PoolLogger = require('./libs/logUtil.js');
var BlocknotifyListener = require('./libs/blocknotifyListener.js'); var BlocknotifyListener = require('./libs/blocknotifyListener.js');
var RedisBlocknotifyListener = require('./libs/redisblocknotifyListener.js'); var RedisBlocknotifyListener = require('./libs/redisblocknotifyListener.js');
var WorkerListener = require('./libs/workerListener.js'); var WorkerListener = require('./libs/workerListener.js');
var PoolWorker = require('./libs/poolWorker.js'); var PoolWorker = require('./libs/poolWorker.js');
var PaymentProcessor = require('./libs/paymentProcessor.js'); var PaymentProcessor = require('./libs/paymentProcessor.js');
JSON.minify = JSON.minify || require("node-json-minify");
=======
var posix = require('posix');
var PoolLogger = require('./libs/logUtil.js');
var BlocknotifyListener = require('./libs/blocknotifyListener.js');
var WorkerListener = require('./libs/workerListener.js');
var PoolWorker = require('./libs/poolWorker.js');
var PaymentProcessor = require('./libs/paymentProcessor.js');
var Website = require('./libs/website.js'); var Website = require('./libs/website.js');
JSON.minify = JSON.minify || require("node-json-minify"); JSON.minify = JSON.minify || require("node-json-minify");
var portalConfig = JSON.parse(JSON.minify(fs.readFileSync("config.json", {encoding: 'utf8'}))); var portalConfig = JSON.parse(JSON.minify(fs.readFileSync("config.json", {encoding: 'utf8'})));
>>>>>>> 0db53a296f9b77ad6ff76b5f06c7156d5366a777
var loggerInstance = new PoolLogger({ var loggerInstance = new PoolLogger({
@ -75,7 +60,7 @@ if (cluster.isWorker){
Object.keys(cluster.workers).forEach(function(id) { Object.keys(cluster.workers).forEach(function(id) {
cluster.workers[id].send(ipcMessage); cluster.workers[id].send(ipcMessage);
}); });
}, 120000); }, 20000);
} }
@ -193,6 +178,8 @@ var startPaymentProcessor = function(poolConfigs){
var startWebsite = function(portalConfig, poolConfigs){ var startWebsite = function(portalConfig, poolConfigs){
console.log(portalConfig.website);
if (!portalConfig.website.enabled) return; if (!portalConfig.website.enabled) return;
var worker = cluster.fork({ var worker = cluster.fork({
@ -222,12 +209,8 @@ var startWebsite = function(portalConfig, poolConfigs){
startRedisBlockListener(portalConfig); startRedisBlockListener(portalConfig);
startWorkerListener(poolConfigs); startWorkerListener(poolConfigs);
;
<<<<<<< HEAD
})();
=======
startWebsite(portalConfig, poolConfigs); startWebsite(portalConfig, poolConfigs);
})(); })();
>>>>>>> 0db53a296f9b77ad6ff76b5f06c7156d5366a777

9
libs/logUtil.js
View File

@ -53,21 +53,12 @@ var PoolLogger = function (configuration) {
var desc = poolName ? '[' + poolName + '] ' : ''; var desc = poolName ? '[' + poolName + '] ' : '';
console.log( console.log(
<<<<<<< HEAD:libs/logutils.js
'\u001b['+getSeverityColor(severity)+'m' + '\u001b['+getSeverityColor(severity)+'m' +
dateFormat(new Date(), 'yyyy-mm-dd HH:MM:ss') + dateFormat(new Date(), 'yyyy-mm-dd HH:MM:ss') +
" ["+key+"]" + '\u001b[39m: ' + "\t" + " ["+key+"]" + '\u001b[39m: ' + "\t" +
desc + desc +
text); text);
} }
=======
'\u001b[' + getSeverityColor(severity) + 'm' +
dateFormat(new Date(), 'yyyy-mm-dd HH:MM:ss') +
" [" + key + "]" + '\u001b[39m: ' + "\t" +
desc + text
);
};
>>>>>>> 0db53a296f9b77ad6ff76b5f06c7156d5366a777:libs/logUtil.js
// public // public