From d0ad17435127ebecf84b6042cb76aec22906b707 Mon Sep 17 00:00:00 2001 From: Sergey Ulyashev Date: Wed, 9 Mar 2016 21:52:34 +0300 Subject: [PATCH 1/3] Remove deprecated 'log level' stuff --- config/development.json | 1 - config/production.json | 1 - sockets.js | 5 ----- 3 files changed, 7 deletions(-) diff --git a/config/development.json b/config/development.json index 47fb33db..0c79b8e3 100644 --- a/config/development.json +++ b/config/development.json @@ -1,6 +1,5 @@ { "isDev": true, - "logLevel": 3, "server": { "port": 8888, "/* secure */": "/* whether this connects via https */", diff --git a/config/production.json b/config/production.json index 82b3ee44..69c9e4be 100644 --- a/config/production.json +++ b/config/production.json @@ -1,6 +1,5 @@ { "isDev": false, - "logLevel": 3, "server": { "port": 8888, "/* secure */": "/* whether this connects via https */", diff --git a/sockets.js b/sockets.js index 41a1c221..dfb80050 100644 --- a/sockets.js +++ b/sockets.js @@ -5,11 +5,6 @@ var socketIO = require('socket.io'), module.exports = function (server, config) { var io = socketIO.listen(server); - if (config.logLevel) { - // https://github.com/Automattic/socket.io/wiki/Configuring-Socket.IO - io.set('log level', config.logLevel); - } - io.sockets.on('connection', function (client) { client.resources = { screen: false, From 60d5619ae2e8a7378d5d58083e181c79d7253b54 Mon Sep 17 00:00:00 2001 From: Sergey Ulyashev Date: Wed, 9 Mar 2016 21:58:40 +0300 Subject: [PATCH 2/3] Updated socket.io-client to ver. 1.4.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bb3f600..45662049 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "url": "git@github.com:andyet/signal-master.git" }, "devDependencies": { - "socket.io-client": "0.9.16", + "socket.io-client": "1.4.5", "precommit-hook": "0.3.10", "tape": "^2.13.1" }, From c35037cd74ce476c3b70d12879b00bd122990f15 Mon Sep 17 00:00:00 2001 From: Sergey Ulyashev Date: Wed, 9 Mar 2016 22:03:32 +0300 Subject: [PATCH 3/3] Fix maxClients fail in socket.io 1.3.7 --- package.json | 2 +- sockets.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 45662049..fa994920 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dependencies": { "getconfig": "2.1.0", "node-uuid": "1.2.0", - "socket.io": "^1.3.7", + "socket.io": "1.3.7", "yetify": "0.0.1" }, "main": "server.js", diff --git a/sockets.js b/sockets.js index dfb80050..e12dc188 100644 --- a/sockets.js +++ b/sockets.js @@ -137,7 +137,11 @@ module.exports = function (server, config) { } function clientsInRoom(name) { - return io.sockets.clients(name).length; + var clientsCount = 0; + for (var socketId in io.nsps['/'].adapter.rooms[name] || {}) { + clientsCount++; + } + return clientsCount; } };