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

fixed #2142 -- passing in cached (pre-required) redis module into socket.io so it uses the same redis module... why? who bloody knows.

Browse Source
This commit is contained in:
Julian Lam
2014-09-25 11:53:46 -04:00
parent 1a18bf22aa
commit 5a36c33fac
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/database/redis.js
View File

@@ -93,16 +93,10 @@
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'), { auth_pass: nconf.get('redis:password') });
} 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'), { auth_pass: nconf.get('redis:password') });
}
if (nconf.get('redis:password')) {
cxn.auth(nconf.get('redis:password'));
} else {
winston.warn('You have no redis password setup!');
} }
cxn.on('error', function (err) { cxn.on('error', function (err) {

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

@@ -82,7 +82,10 @@ Sockets.init = function(server) {
sub = database.connect(), sub = database.connect(),
client = database.connect(); client = database.connect();
// "redis" property needs to be passed in as referenced here: https://github.com/Automattic/socket.io/issues/808
// Probably fixed in socket.IO 1.0
config.store = new RedisStore({ config.store = new RedisStore({
redis: require('redis'),
redisPub : pub, redisPub : pub,
redisSub : sub, redisSub : sub,
redisClient : client redisClient : client