fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2336 from ether/more-socket-io-fixes 

more fixes
This commit is contained in:
John McLear 2014-11-23 22:34:30 +00:00
parent 555d22245d a3f6b2edb7
commit 945d6c83c1
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/node/handler/PadMessageHandler.js
View File

@ -98,7 +98,14 @@ exports.kickSessionsFromPad = function(padID)
return; return;
//skip if there is nobody on this pad //skip if there is nobody on this pad
if(socketio.sockets.clients(padID).length == 0) var roomClients = [], room = socketio.sockets.adapter.rooms[padID];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
if(roomClients.length == 0)
return; return;
//disconnect everyone from this pad //disconnect everyone from this pad
@ -1589,8 +1596,16 @@ function composePadChangesets(padId, startNum, endNum, callback)
* Get the number of users in a pad * Get the number of users in a pad
*/ */
exports.padUsersCount = function (padID, callback) { exports.padUsersCount = function (padID, callback) {
var roomClients = [], room = socketio.sockets.adapter.rooms[padID];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
callback(null, { callback(null, {
padUsersCount: socketio.sockets.clients(padID).length padUsersCount: roomClients.length
}); });
} }
@ -1600,7 +1615,14 @@ exports.padUsersCount = function (padID, callback) {
exports.padUsers = function (padID, callback) { exports.padUsers = function (padID, callback) {
var result = []; var result = [];
async.forEach(socketio.sockets.clients(padID), function(roomClient, callback) { var roomClients = [], room = socketio.sockets.adapter.rooms[padID];
if (room) {
for (var id in room) {
roomClients.push(socketio.sockets.adapter.nsp.connected[id]);
}
}
async.forEach(roomClients, function(roomClient, callback) {
var s = sessioninfos[roomClient.id]; var s = sessioninfos[roomClient.id];
if(s) { if(s) {
authorManager.getAuthor(s.author, function(err, author) { authorManager.getAuthor(s.author, function(err, author) {