Merge branch 'master' of https://github.com/designcreateplay/NodeBB

src/user.js

@@ -964,9 +964,7 @@ var bcrypt = require('bcryptjs'),
 	};
 
 	User.logIP = function(uid, ip) {
-		db.sortedSetAdd('uid:' + uid + ':ip', +new Date(), ip || 'Unknown', function(err) {
+		db.sortedSetAdd('uid:' + uid + ':ip', +new Date(), ip || 'Unknown');
-			console.log(ip, 'for uid', uid);
-		});
 	};
 
 	User.email = {

src/webserver.js

@@ -278,6 +278,9 @@ process.on('uncaughtException', function(err) {
 					// Disable framing
 					res.setHeader('X-Frame-Options', 'SAMEORIGIN');
 
+					// Log IP address
+					db.sortedSetAdd('ip:recent', +new Date(), req.ip || 'Unknown');
+
 					next();
 				});