Comparing version 0.5.6 to 0.5.7
@@ -40,5 +40,2 @@ // Generated by CoffeeScript 1.6.2 | ||
redis_cache = settings.redis_cache || {}; | ||
redis_cache.host || (redis_cache.host = '127.0.0.1'); | ||
redis_cache.port || (redis_cache.port = 6379); | ||
redis_cache.database || (redis_cache.database = 0); | ||
this._redis_cache_settings = redis_cache; | ||
@@ -166,9 +163,4 @@ this.connected = false; | ||
Connection.prototype._connectRedisCache = function(callback) { | ||
var client, settings, | ||
_this = this; | ||
var client, settings; | ||
if (this._connecting_redis_cache) { | ||
this.once('redis_cache_connected', callback); | ||
return; | ||
} | ||
if (this._redis_cache_client) { | ||
@@ -179,15 +171,13 @@ return callback(null, this._redis_cache_client); | ||
} else { | ||
this._connecting_redis_cache = true; | ||
settings = this._redis_cache_settings; | ||
client = redis.createClient(settings.port || 6379, settings.host || '127.0.0.1'); | ||
return client.on('connect', function() { | ||
return client.select(settings.database || 0, function(error) { | ||
_this._connecting_redis_cache = false; | ||
if (!error) { | ||
_this._redis_cache_client = client; | ||
} | ||
_this.emit('redis_cache_connected', error, client); | ||
return callback(error, client); | ||
this._redis_cache_client = client = settings.client || (redis.createClient(settings.port || 6379, settings.host || '127.0.0.1')); | ||
if (settings.database != null) { | ||
client.select(settings.database); | ||
client.once('connect', function() { | ||
client.send_anyways = true; | ||
client.select(settings.database); | ||
return client.send_anyways = false; | ||
}); | ||
}); | ||
} | ||
return callback(null, client); | ||
} | ||
@@ -194,0 +184,0 @@ }; |
{ | ||
"name": "cormo", | ||
"description": "ORM framework for Node.js", | ||
"version": "0.5.6", | ||
"version": "0.5.7", | ||
"keywords": [ | ||
@@ -6,0 +6,0 @@ "orm", |
203079
5031