Skip to content

修复statusService不能使用自定义statusManager的bug. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kikoroc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修复statusService不能使用自定义statusManager的bug. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ae330a
add redis slave feature
kikoroc Mar 29, 2016
2153afe
fix getStatusManager bug.
kikoroc Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions lib/manager/statusManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,27 @@ var StatusManager = function(app, opts) {
this.prefix = opts.prefix || DEFAULT_PREFIX;
this.host = opts.host;
this.port = opts.port;
this.slaveConf = opts.slaveConf;
this.redis = null;
this.redisSlaves = [];
};

module.exports = StatusManager;

StatusManager.prototype.start = function(cb) {
var self = this;
//init redis slaves
this.slaveConf.forEach(function(conf){
var slave = redis.createClient(conf.port, conf.host);
if(conf.auth_pass) {
slave.auth(conf.auth_pass);
}
slave.on("error", function(err){
console.error("[status-plugin][redis-slave]"+ err.stack);
});
self.redisSlaves.push(slave);
});
//init redis master
this.redis = redis.createClient(this.port, this.host, this.opts);
if (this.opts.auth_pass) {
this.redis.auth(this.opts.auth_pass);
Expand All @@ -30,9 +45,15 @@ StatusManager.prototype.stop = function(force, cb) {
this.redis.end();
this.redis = null;
}
//stop slaves
this.redisSlaves.forEach(function(slave){
slave.end();
});
this.redisSlaves = [];
utils.invokeCallback(cb);
};

//clean on master
StatusManager.prototype.clean = function(cb) {
var cmds = [];
var self = this;
Expand All @@ -48,30 +69,34 @@ StatusManager.prototype.clean = function(cb) {
});
};

//write on master
StatusManager.prototype.add = function(uid, sid ,cb) {
this.redis.sadd(genKey(this, uid), sid, function(err) {
utils.invokeCallback(cb, err);
});
};

//write on master
StatusManager.prototype.leave = function(uid, sid, cb) {
this.redis.srem(genKey(this, uid), sid, function(err) {
utils.invokeCallback(cb, err);
});
};

//read on slave
StatusManager.prototype.getSidsByUid = function(uid, cb) {
this.redis.smembers(genKey(this, uid), function(err, list) {
randomRedisSlave(this).smembers(genKey(this, uid), function(err, list) {
utils.invokeCallback(cb, err, list);
});
};

//read on slave
StatusManager.prototype.getSidsByUids = function(uids, cb) {
var cmds = [];
for (var i=0; i<uids.length; i++) {
cmds.push(['exists', genKey(this, uids[i])]);
}
execMultiCommands(this.redis, cmds, function(err, list) {
execMultiCommands(randomRedisSlave(this), cmds, function(err, list) {
utils.invokeCallback(cb, err, list);
});
};
Expand All @@ -93,3 +118,8 @@ var genKey = function(self, uid) {
var genCleanKey = function(self) {
return self.prefix + '*';
};

//return random redis slave instance.
var randomRedisSlave = function(self){
return self.redisSlaves[Math.floor(Math.random()*self.redisSlaves.length)];
};
2 changes: 1 addition & 1 deletion lib/service/statusService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ var getStatusManager = function(app, opts) {
var manager;

if(typeof opts.statusManager === 'function') {
manager = opts.statusManager(app, opts);
manager = new opts.statusManager(app, opts);
} else {
manager = opts.statusManager;
}
Expand Down