Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

update to socket.io 1.2.1, return_buffers option

Browse Source
This commit is contained in:
barisusakli
2014-11-24 13:44:59 -05:00
parent 04175c92d9
commit 7cbaa90d36
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -54,8 +54,8 @@
"semver": "^4.0.3", "semver": "^4.0.3",
"serve-favicon": "^2.1.5", "serve-favicon": "^2.1.5",
"sitemap": "^0.7.4", "sitemap": "^0.7.4",
"socket.io": "^1.2.0", "socket.io": "^1.2.1",
"socket.io-client": "^1.2.0", "socket.io-client": "^1.2.1",
"socket.io-redis": "^0.1.3", "socket.io-redis": "^0.1.3",
"socketio-wildcard": "~0.1.1", "socketio-wildcard": "~0.1.1",
"string": "^2.1.0", "string": "^2.1.0",

8
src/database/redis.js
View File

@@ -74,20 +74,22 @@
} }
}; };
module.connect = function() { module.connect = function(options) {
var redis_socket_or_host = nconf.get('redis:host'), var redis_socket_or_host = nconf.get('redis:host'),
cxn, dbIdx; cxn, dbIdx;
options = options || {};
if (!redis) { if (!redis) {
redis = require('redis'); redis = require('redis');
} }
if (redis_socket_or_host && redis_socket_or_host.indexOf('/') >= 0) { if (redis_socket_or_host && redis_socket_or_host.indexOf('/') >= 0) {
/* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */ /* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */
cxn = redis.createClient(nconf.get('redis:host')); cxn = redis.createClient(nconf.get('redis:host'), options);
} else { } else {
/* Else, connect over tcp/ip */ /* Else, connect over tcp/ip */
cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host')); cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'), options);
} }
cxn.on('error', function (err) { cxn.on('error', function (err) {

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

@@ -233,8 +233,8 @@ function addRedisAdapter(io) {
if (nconf.get('redis')) { if (nconf.get('redis')) {
var redisAdapter = require('socket.io-redis'); var redisAdapter = require('socket.io-redis');
var redis = require('../database/redis'); var redis = require('../database/redis');
var pub = redis.connect(); var pub = redis.connect({return_buffers: true});
var sub = redis.connect(); var sub = redis.connect({return_buffers: true});
io.adapter(redisAdapter({pubClient: pub, subClient: sub})); io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
} else { } else {