Merged stuff
This commit is contained in:
parent
437e242a25
commit
5b3c12508e
40
config.json
40
config.json
|
@ -11,9 +11,10 @@
|
|||
},
|
||||
|
||||
"redisBlockNotifyListener": {
|
||||
"redisPort": 6379,
|
||||
"redisHost": "coindaemons.ultimatecoinpool.com",
|
||||
"psubscribeKey": "newblocks:*"
|
||||
"enabled" : false,
|
||||
"redisPort" : 6379,
|
||||
"redisHost" : "hostname",
|
||||
"psubscribeKey" : "newblocks:*"
|
||||
},
|
||||
"proxy": {
|
||||
"enabled": true,
|
||||
|
@ -21,36 +22,37 @@
|
|||
"80": {
|
||||
"diff": 32,
|
||||
"varDiff": {
|
||||
"minDiff": 8,
|
||||
"maxDiff": 512,
|
||||
"targetTime": 15,
|
||||
"retargetTime": 90,
|
||||
"variancePercent": 30
|
||||
"minDiff" : 8,
|
||||
"maxDiff" : 512,
|
||||
"targetTime" : 15,
|
||||
"retargetTime" : 90,
|
||||
"variancePercent" : 30
|
||||
}
|
||||
},
|
||||
"6000": {
|
||||
"diff": 32,
|
||||
"varDiff": {
|
||||
"minDiff": 8,
|
||||
"maxDiff": 512,
|
||||
"targetTime": 15,
|
||||
"retargetTime": 90,
|
||||
"variancePercent": 30
|
||||
"minDiff" : 8,
|
||||
"maxDiff" : 512,
|
||||
"targetTime" : 15,
|
||||
"retargetTime" : 90,
|
||||
"variancePercent" : 30
|
||||
}
|
||||
},
|
||||
"8080": {
|
||||
"diff": 32,
|
||||
"varDiff": {
|
||||
"minDiff": 8,
|
||||
"maxDiff": 512,
|
||||
"targetTime": 15,
|
||||
"retargetTime": 90,
|
||||
"variancePercent": 30
|
||||
"minDiff" : 8,
|
||||
"maxDiff" : 512,
|
||||
"targetTime" : 15,
|
||||
"retargetTime" : 90,
|
||||
"variancePercent" : 30
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"website": {
|
||||
"enabled": true,
|
||||
"enabled": false,
|
||||
"port": 80,
|
||||
"liveStats": true
|
||||
}
|
||||
|
|
29
init.js
29
init.js
|
@ -3,32 +3,17 @@ var os = require('os');
|
|||
var cluster = require('cluster');
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
var posix = require('posix');
|
||||
var PoolLogger = require('./libs/logutils.js');
|
||||
var PoolLogger = require('./libs/logUtil.js');
|
||||
var BlocknotifyListener = require('./libs/blocknotifyListener.js');
|
||||
var RedisBlocknotifyListener = require('./libs/redisblocknotifyListener.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');
|
||||
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');
|
||||
|
||||
JSON.minify = JSON.minify || require("node-json-minify");
|
||||
|
||||
|
||||
var portalConfig = JSON.parse(JSON.minify(fs.readFileSync("config.json", {encoding: 'utf8'})));
|
||||
>>>>>>> 0db53a296f9b77ad6ff76b5f06c7156d5366a777
|
||||
|
||||
|
||||
var loggerInstance = new PoolLogger({
|
||||
|
@ -75,7 +60,7 @@ if (cluster.isWorker){
|
|||
Object.keys(cluster.workers).forEach(function(id) {
|
||||
cluster.workers[id].send(ipcMessage);
|
||||
});
|
||||
}, 120000);
|
||||
}, 20000);
|
||||
}
|
||||
|
||||
|
||||
|
@ -193,6 +178,8 @@ var startPaymentProcessor = function(poolConfigs){
|
|||
|
||||
|
||||
var startWebsite = function(portalConfig, poolConfigs){
|
||||
console.log(portalConfig.website);
|
||||
|
||||
if (!portalConfig.website.enabled) return;
|
||||
|
||||
var worker = cluster.fork({
|
||||
|
@ -222,12 +209,8 @@ var startWebsite = function(portalConfig, poolConfigs){
|
|||
startRedisBlockListener(portalConfig);
|
||||
|
||||
startWorkerListener(poolConfigs);
|
||||
;
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
})();
|
||||
=======
|
||||
startWebsite(portalConfig, poolConfigs);
|
||||
|
||||
})();
|
||||
>>>>>>> 0db53a296f9b77ad6ff76b5f06c7156d5366a777
|
||||
|
|
|
@ -53,21 +53,12 @@ var PoolLogger = function (configuration) {
|
|||
|
||||
var desc = poolName ? '[' + poolName + '] ' : '';
|
||||
console.log(
|
||||
<<<<<<< HEAD:libs/logutils.js
|
||||
'\u001b['+getSeverityColor(severity)+'m' +
|
||||
dateFormat(new Date(), 'yyyy-mm-dd HH:MM:ss') +
|
||||
" ["+key+"]" + '\u001b[39m: ' + "\t" +
|
||||
desc +
|
||||
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue