Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

user.isOnline fix

Browse Source 
wont hit db on every user socket connect or user disconnect
This commit is contained in:
barisusakli
2014-09-06 22:08:55 -04:00
parent fe58ea55d4
commit b7ee875b12
10 changed files with 90 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@ var SocketIO = require('socket.io'),
db = require('../database'),
user = require('../user'),
socketUser = require('./user'),
topics = require('../topics'),
logger = require('../logger'),
meta = require('../meta'),
@@ -59,9 +58,9 @@ function onMessage(msg) {
onlineUsersMap[msg.uid] -= 1;
onlineUsersMap[msg.uid] = Math.max(0, onlineUsersMap[msg.uid]);
}
var index = 0;
if (msg.uid && onlineUsersMap[msg.uid] === 0) {
var index = onlineUsers.indexOf(msg.uid);
index = onlineUsers.indexOf(msg.uid);
if (index !== -1) {
onlineUsers.splice(index, 1);
}
@@ -162,7 +161,7 @@ Sockets.init = function(server) {
async.parallel({
user: function(next) {
user.getUserFields(uid, ['username', 'userslug', 'picture'], next);
user.getUserFields(uid, ['username', 'userslug', 'picture', 'status'], next);
},
isAdmin: function(next) {
user.isAdministrator(uid, next);
@@ -180,9 +179,7 @@ Sockets.init = function(server) {
uid: uid
});
socketUser.isOnline(socket, uid, function(err, data) {
socket.broadcast.emit('user.isOnline', err, data);
});
socket.broadcast.emit('event:user_status_change', {uid:uid, status: userData.user.status});
});
});
} else {
@@ -200,9 +197,10 @@ Sockets.init = function(server) {
if (uid && (!onlineUsersMap[uid] || onlineUsersMap[uid] <= 1)) {
db.sortedSetRemove('users:online', uid, function(err) {
socketUser.isOnline(socket, uid, function(err, data) {
socket.broadcast.emit('user.isOnline', err, data);
});
if (err) {
return winston.error(err.message);
}
socket.broadcast.emit('event:user_status_change', {uid: uid, status: 'offline'});
});
}
@@ -295,7 +293,8 @@ Sockets.uidInRoom = function(uid, room) {
Sockets.getSocketCount = function() {
return Object.keys(socketIdToUid).length;
}
};
Sockets.getConnectedClients = function() {
return onlineUsers;
};