Merge remote-tracking branch 'origin/master' into socket.io1.x

src/emailer.js

@@ -11,16 +11,20 @@ var	fs = require('fs'),
 	meta = require('./meta'),
 	translator = require('../public/src/translator'),
 
-	app = {},
-	Emailer = {};
-
+	app;
 
+(function(Emailer) {
 	Emailer.registerApp = function(expressApp) {
 		app = expressApp;
 		return Emailer;
 	};
 
 	Emailer.send = function(template, uid, params) {
+		if (!app) {
+			winston.warn('[emailer] App not ready!');
+			return;
+		}
+
 		async.parallel({
 			html: function(next) {
 				app.render('emails/' + template, params, next);
@@ -58,5 +62,5 @@ Emailer.send = function(template, uid, params) {
 			});
 		});
 	};
+}(module.exports));
 
-module.exports = Emailer;

src/user/digest.js

@@ -11,7 +11,7 @@ var	async = require('async'),
 	batch = require('../batch'),
 	emailer = require('../emailer');
 
-module.exports = (function(Digest) {
+(function(Digest) {
 	Digest.execute = function(interval) {
 		var digestsDisabled = meta.config.disableEmailSubscriptions !== undefined && parseInt(meta.config.disableEmailSubscriptions, 10) === 1;
 		if (digestsDisabled) {
@@ -71,14 +71,14 @@ module.exports = (function(Digest) {
 
 		user.getMultipleUserFields(data.subscribers, ['uid', 'username', 'lastonline'], function(err, users) {
 			if (err) {
-				winston.error('[user/jobs] Could not send digests (' + interval + '): ' + err.message);
+				winston.error('[user/jobs] Could not send digests (' + data.interval + '): ' + err.message);
 				return callback(err);
 			}
 
 			async.eachLimit(users, 100, function(userObj, next) {
 				user.notifications.getDailyUnread(userObj.uid, function(err, notifications) {
 					if (err) {
-						winston.error('[user/jobs] Could not send digests (' + interval + '): ' + err.message);
+						winston.error('[user/jobs] Could not send digests (' + data.interval + '): ' + err.message);
 						return next(err);
 					}
 
@@ -109,7 +109,6 @@ module.exports = (function(Digest) {
 				});
 			}, callback);
 		});
-	}
+	};
 
-	return Digest;
-})({});
+}(module.exports));