Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 10:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-10 16:22:12 -05:00
parent 7f124a3ccf 21bc1fba3f
commit eae541d040
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,7 +197,7 @@ function addRedisAdapter(io) {
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();
var sub = redis.connect({return_buffers: true}); var sub = redis.connect();
io.adapter(redisAdapter({pubClient: pub, subClient: sub})); io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
} else if (nconf.get('isCluster') === 'true') { } else if (nconf.get('isCluster') === 'true') {
winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.'); winston.warn('[socket.io] Clustering detected, you are advised to configure Redis as a websocket store.');

8
src/user/jobs.js
View File

@@ -32,28 +32,28 @@ module.exports = function (User) {
} }
winston.verbose('[user/jobs] ' + terminated + ' jobs terminated'); winston.verbose('[user/jobs] ' + terminated + ' jobs terminated');
jobs['digest.daily'] = new cronJob('0 0 ' + digestHour + ' * * *', function () { jobs['digest.daily'] = new cronJob('0 ' + digestHour + ' * * *', function () {
winston.verbose('[user/jobs] Digest job (daily) started.'); winston.verbose('[user/jobs] Digest job (daily) started.');
User.digest.execute('day'); User.digest.execute('day');
}, null, true); }, null, true);
winston.verbose('[user/jobs] Starting job (digest.daily)'); winston.verbose('[user/jobs] Starting job (digest.daily)');
++started; ++started;
jobs['digest.weekly'] = new cronJob('0 0 ' + digestHour + ' * * 0', function () { jobs['digest.weekly'] = new cronJob('0 ' + digestHour + ' * * 0', function () {
winston.verbose('[user/jobs] Digest job (weekly) started.'); winston.verbose('[user/jobs] Digest job (weekly) started.');
User.digest.execute('week'); User.digest.execute('week');
}, null, true); }, null, true);
winston.verbose('[user/jobs] Starting job (digest.weekly)'); winston.verbose('[user/jobs] Starting job (digest.weekly)');
++started; ++started;
jobs['digest.monthly'] = new cronJob('0 0 ' + digestHour + ' 1 * *', function () { jobs['digest.monthly'] = new cronJob('0 ' + digestHour + ' 1 * *', function () {
winston.verbose('[user/jobs] Digest job (monthly) started.'); winston.verbose('[user/jobs] Digest job (monthly) started.');
User.digest.execute('month'); User.digest.execute('month');
}, null, true); }, null, true);
winston.verbose('[user/jobs] Starting job (digest.monthly)'); winston.verbose('[user/jobs] Starting job (digest.monthly)');
++started; ++started;
jobs['reset.clean'] = new cronJob('0 0 0 * * *', User.reset.clean, null, true); jobs['reset.clean'] = new cronJob('0 0 * * *', User.reset.clean, null, true);
winston.verbose('[user/jobs] Starting job (reset.clean)'); winston.verbose('[user/jobs] Starting job (reset.clean)');
++started; ++started;