Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

using redis for user online list management if configured

Browse Source
This commit is contained in:
Julian Lam
2014-11-28 12:34:19 -05:00
parent e952a873a8
commit 7ad242b981
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/socket.io/index.js
View File

@@ -48,7 +48,9 @@ var onlineUsers = [];
// } // }
function onUserConnect(uid, socketid) { function onUserConnect(uid, socketid) {
db.sortedSetIncrBy('onlineUsers', 1, uid, function(err, score) { var database = Sockets.redisDB ? Sockets.redisDB : db;
database.sortedSetIncrBy('onlineUsers', 1, uid, function(err, score) {
if (err) { if (err) {
return winston.error('[socket.io] Could not add socket id ' + socketid + ' (uid ' + uid + ') to the online users list.'); return winston.error('[socket.io] Could not add socket id ' + socketid + ' (uid ' + uid + ') to the online users list.');
} }
@@ -65,13 +67,15 @@ function onUserConnect(uid, socketid) {
function onUserDisconnect(uid, socketid, socketCount) { function onUserDisconnect(uid, socketid, socketCount) {
// baris, I no longer use socketCount here, since the zset score is the # of connections, just FYI. // baris, I no longer use socketCount here, since the zset score is the # of connections, just FYI.
db.sortedSetIncrBy('onlineUsers', -1, uid, function(err, score) { var database = Sockets.redisDB ? Sockets.redisDB : db;
database.sortedSetIncrBy('onlineUsers', -1, uid, function(err, score) {
if (err) { if (err) {
return winston.error('[socket.io] Could not remove socket id ' + socketid + ' (uid ' + uid + ') from the online users list.'); return winston.error('[socket.io] Could not remove socket id ' + socketid + ' (uid ' + uid + ') from the online users list.');
} }
if (parseInt(score, 10) === 0) { if (parseInt(score, 10) === 0) {
db.sortedSetRemove('onlineUsers', uid, function(err) { database.sortedSetRemove('onlineUsers', uid, function(err) {
if (err) { if (err) {
winston.error('[socket.io] Could not remove uid ' + uid + ' from the online users list') winston.error('[socket.io] Could not remove uid ' + uid + ' from the online users list')
} else { } else {
@@ -102,11 +106,14 @@ Sockets.init = function(server) {
// If a redis server is configured, use it as a socket.io store, otherwise, fall back to in-memory store // If a redis server is configured, use it as a socket.io store, otherwise, fall back to in-memory store
if (nconf.get('redis')) { if (nconf.get('redis')) {
var RedisStore = require('socket.io/lib/stores/redis'), var RedisStore = require('socket.io/lib/stores/redis');
database = require('../database/redis'),
pub = database.connect(), Sockets.redisDB = require('../database/redis');
sub = database.connect(), Sockets.redisDB.init();
client = database.connect();
var pub = Sockets.redisDB.connect(),
sub = Sockets.redisDB.connect(),
client = Sockets.redisDB.connect();
// "redis" property needs to be passed in as referenced here: https://github.com/Automattic/socket.io/issues/808 // "redis" property needs to be passed in as referenced here: https://github.com/Automattic/socket.io/issues/808
// Probably fixed in socket.IO 1.0 // Probably fixed in socket.IO 1.0
@@ -138,7 +145,7 @@ Sockets.init = function(server) {
}); });
// Clearing the online users sorted set // Clearing the online users sorted set
db.delete('onlineUsers'); (Sockets.redisDB ? Sockets.redisDB : db)['delete']('onlineUsers');
io.sockets.on('connection', function(socket) { io.sockets.on('connection', function(socket) {
var hs = socket.handshake, var hs = socket.handshake,