diff --git a/src/logger.js b/src/logger.js index a6e929804d..172f2a8830 100644 --- a/src/logger.js +++ b/src/logger.js @@ -159,7 +159,7 @@ var opts = { /* * Restore all hijacked sockets to their original emit/on functions */ - var clients = socket.io.sockets.clients(); + var clients = []; //socket.io.sockets.clients(); doesn't work in socket.io 1.x clients.forEach(function(client) { if(client.oEmit && client.oEmit !== client.emit) { client.emit = client.oEmit; @@ -179,7 +179,7 @@ var opts = { return; } - var clients = socket.io.sockets.clients(); + var clients = []; //socket.io.sockets.clients(); doesn't work in socket.io 1.x clients.forEach(function(client) { Logger.io_one(client, client.uid); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 3915669234..83f838d73b 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -285,7 +285,7 @@ Sockets.uidInRoom = function(uid, room) { }; Sockets.getSocketCount = function() { - return false; + return 0; var clients = io.sockets.manager.rooms['']; return Array.isArray(clients) ? clients.length : 0; diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index 7c1f42a698..e067b03c02 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -86,8 +86,9 @@ SocketMeta.rooms.enter = function(socket, data, callback) { }; SocketMeta.rooms.getAll = function(socket, data, callback) { - var rooms = websockets.server.sockets.manager.rooms, - socketData = { + var rooms = {}; //websockets.server.sockets.manager.rooms; doesnt work in socket.io 1.x + + var socketData = { onlineGuestCount: websockets.getOnlineAnonCount(), onlineRegisteredCount: websockets.getOnlineUserCount(), socketCount: websockets.getSocketCount(),