mirror of https://github.com/BTCPrivate/z-nomp.git
Merge pull request #159 from madbuda/redispw
adding in redis password auth from UNOMP
This commit is contained in:
commit
4c982a73ac
|
@ -25,7 +25,8 @@
|
|||
},
|
||||
"redis": {
|
||||
"host": "127.0.0.1",
|
||||
"port": 6379
|
||||
"port": 6379,
|
||||
"password": ""
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
@ -82,6 +82,8 @@ function SetupForPool(logger, poolOptions, setupFinished){
|
|||
logger[severity](logSystem, logComponent, message);
|
||||
});
|
||||
var redisClient = redis.createClient(poolOptions.redis.port, poolOptions.redis.host);
|
||||
// redis auth if enabled
|
||||
redisClient.auth(poolOptions.redis.password);
|
||||
|
||||
var magnitude;
|
||||
var minPaymentSatoshis;
|
||||
|
|
|
@ -19,6 +19,8 @@ module.exports = function(logger){
|
|||
var proxySwitch = {};
|
||||
|
||||
var redisClient = redis.createClient(portalConfig.redis.port, portalConfig.redis.host);
|
||||
// redis auth if enabled
|
||||
redisClient.auth(portalConfig.redis.password);
|
||||
|
||||
//Handle messages from master process sent via IPC
|
||||
process.on('message', function(message) {
|
||||
|
|
|
@ -27,6 +27,9 @@ module.exports = function(logger, poolConfig){
|
|||
var logSubCat = 'Thread ' + (parseInt(forkId) + 1);
|
||||
|
||||
var connection = redis.createClient(redisConfig.port, redisConfig.host);
|
||||
// redis auth if needed
|
||||
connection.auth(redisConfig.password);
|
||||
|
||||
connection.on('ready', function(){
|
||||
logger.debug(logSystem, logComponent, logSubCat, 'Share processing setup with redis (' + redisConfig.host +
|
||||
':' + redisConfig.port + ')');
|
||||
|
|
|
@ -7,6 +7,13 @@ var os = require('os');
|
|||
|
||||
var algos = require('stratum-pool/lib/algoProperties.js');
|
||||
|
||||
// redis callback Ready check failed bypass trick
|
||||
function rediscreateClient(port, host, pass) {
|
||||
var client = redis.createClient(port, host);
|
||||
client.auth(pass);
|
||||
return client;
|
||||
}
|
||||
|
||||
function balanceRound(number) {
|
||||
return parseFloat((Math.round(number * 100000000) / 100000000).toFixed(8));
|
||||
}
|
||||
|
@ -80,14 +87,14 @@ module.exports = function(logger, portalConfig, poolConfigs){
|
|||
}
|
||||
redisClients.push({
|
||||
coins: [coin],
|
||||
client: redis.createClient(redisConfig.port, redisConfig.host)
|
||||
client: rediscreateClient(redisConfig.port, redisConfig.host, redisConfig.password)
|
||||
});
|
||||
});
|
||||
|
||||
function setupStatsRedis(){
|
||||
redisStats = redis.createClient(portalConfig.redis.port, portalConfig.redis.host);
|
||||
redisStats.on('error', function(err){
|
||||
logger.error(logSystem, 'Historics', 'Redis for stats had an error ' + JSON.stringify(err));
|
||||
redisStats.auth(portalConfig.redis.password);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ module.exports = function(logger){
|
|||
var keyScriptTemplate = '';
|
||||
var keyScriptProcessed = '';
|
||||
|
||||
|
||||
var processTemplates = function(){
|
||||
|
||||
for (var pageName in pageTemplates){
|
||||
|
@ -135,6 +134,7 @@ module.exports = function(logger){
|
|||
async.waterfall([
|
||||
function(callback){
|
||||
var client = redis.createClient(portalConfig.redis.port, portalConfig.redis.host);
|
||||
client.auth(portalConfig.redis.password);
|
||||
client.hgetall('coinVersionBytes', function(err, coinBytes){
|
||||
if (err){
|
||||
client.quit();
|
||||
|
|
Loading…
Reference in New Issue