Merge branch 'master' into develop

src/socket.io/index.js

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

src/user/jobs.js

@@ -32,28 +32,28 @@ module.exports = function (User) {
 		}
 		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.');
 			User.digest.execute('day');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.daily)');
 		++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.');
 			User.digest.execute('week');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.weekly)');
 		++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.');
 			User.digest.execute('month');
 		}, null, true);
 		winston.verbose('[user/jobs] Starting job (digest.monthly)');
 		++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)');
 		++started;