mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	fixed the rest of the bugs that arised from the redis refactor
This commit is contained in:
		| @@ -238,6 +238,7 @@ var	RDB = require('./redis.js'), | ||||
| 	Posts.hasFavourited = function(pid, uid, callback) { | ||||
| 		RDB.sismember('pid:' + pid + ':users_favourited', uid, function(err, hasFavourited) { | ||||
| 			RDB.handle(err); | ||||
| 			 | ||||
| 			callback(hasFavourited); | ||||
| 		}); | ||||
| 	} | ||||
| @@ -248,8 +249,7 @@ var	RDB = require('./redis.js'), | ||||
|  | ||||
| 		for (var i=0, ii=pids.length; i<ii; i++) { | ||||
| 			(function(post_id) { | ||||
| 				Posts.hasFavourited(post_id, uid, function(err, hasFavourited) { | ||||
| 					RDB.handle(err); | ||||
| 				Posts.hasFavourited(post_id, uid, function(hasFavourited) { | ||||
| 			 | ||||
| 					data[post_id] = hasFavourited; | ||||
| 					loaded ++; | ||||
|   | ||||
| @@ -9,14 +9,13 @@ | ||||
| 	RedisDB.exports = redis.createClient(config.redis.port, config.redis.host, config.redis.options); | ||||
|  | ||||
| 	RedisDB.exports.handle = function(error) { | ||||
| 		return; | ||||
| 		if (error !== null) { | ||||
| 			if (PRODUCTION === false) { | ||||
| 				console.log("################# ERROR LOG ####################"); | ||||
| 				console.log(error); | ||||
| 				console.log(arguments.callee.name); | ||||
| 				throw new Error('RedisDB Error: ' + error); | ||||
| 				console.log("################# ERROR LOG ####################"); | ||||
| 				throw new Error('RedisDB Error: ' + error); | ||||
| 			} else if (ERROR_LOGS === true) { | ||||
| 				console.log('RedisDB Error: ' + error); | ||||
| 			} | ||||
|   | ||||
							
								
								
									
										11
									
								
								src/user.js
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								src/user.js
									
									
									
									
									
								
							| @@ -431,8 +431,15 @@ var	config = require('../config.js'), | ||||
| 		// Start, replace, or extend a session | ||||
| 		RDB.get('sess:' + sessionID, function(err, session) { | ||||
| 			RDB.handle(err); | ||||
| 			RDB.set('sess:' + sessionID + ':uid', uid, 60*60*24*14);	// Login valid for two weeks | ||||
| 			RDB.set('uid:' + uid + ':session', sessionID, 60*60*24*14); | ||||
|  | ||||
| 			var expiry = 60*60*24*14, // Login valid for two weeks | ||||
| 				sess_key = 'sess:' + sessionID + ':uid', | ||||
| 				uid_key = 'uid:' + uid + ':session'; | ||||
|  | ||||
| 			RDB.set(sess_key, uid); | ||||
| 			RDB.expire(sess_key, expiry); | ||||
| 			RDB.set(uid_key, sessionID); | ||||
| 			RDB.expire(uid_key, expiry); | ||||
| 		}); | ||||
| 	} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user