From 5e901a76aa91a497e6909b257cefa5f60c8d55f7 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 9 May 2013 05:48:55 +0000
Subject: [PATCH] fixed the rest of the bugs that arised from the redis
 refactor

---
 src/posts.js |  4 ++--
 src/redis.js |  3 +--
 src/user.js  | 11 +++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/posts.js b/src/posts.js
index 53b98710e1..0c92061829 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -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 ++;
diff --git a/src/redis.js b/src/redis.js
index 9f32613eae..77382029cf 100644
--- a/src/redis.js
+++ b/src/redis.js
@@ -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);
 			}
diff --git a/src/user.js b/src/user.js
index d7d81e1bf5..872d562c09 100644
--- a/src/user.js
+++ b/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);
 		});
 	}