From cd28a4fbcc6828bff784853d17d9206d547c4720 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 6 Jul 2015 11:52:34 +0200
Subject: [PATCH] redis-mpool `noReadyCheck` and `unwatchOnRelease` options
 from config do not extend them as it disallows to pick from config

---
 NEWS.md                                    | 2 ++
 app.js                                     | 8 ++++++--
 config/environments/development.js.example | 4 +++-
 config/environments/production.js.example  | 4 +++-
 config/environments/staging.js.example     | 4 +++-
 config/environments/test.js.example        | 4 +++-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index af0e9abc..33639f10 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,8 @@
 
 Released 2015-mm-dd
 
+Bug fixes:
+ - redis-mpool `noReadyCheck` and `unwatchOnRelease` options from config and defaulted
 
 
 ## 2.7.0
diff --git a/app.js b/app.js
index 3f35fe47..152a6374 100755
--- a/app.js
+++ b/app.js
@@ -65,8 +65,12 @@ if ( global.environment.log_filename ) {
 global.log4js.configure(log4js_config, { cwd: __dirname });
 global.logger = global.log4js.getLogger();
 
-var redisOpts = _.extend(global.environment.redis, { name: 'windshaft', unwatchOnRelease: false, noReadyCheck: true }),
-    redisPool = new RedisPool(redisOpts);
+var redisOpts = _.defaults(global.environment.redis, {
+    name: 'windshaft',
+    unwatchOnRelease: false,
+    noReadyCheck: true
+});
+var redisPool = new RedisPool(redisOpts);
 
 // Include cartodb_windshaft only _after_ the "global" variable is set
 // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28
diff --git a/config/environments/development.js.example b/config/environments/development.js.example
index 497e3421..3fcf78f9 100644
--- a/config/environments/development.js.example
+++ b/config/environments/development.js.example
@@ -176,7 +176,9 @@ var config = {
         },
         emitter: {
             statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
     ,varnish: {
         host: 'localhost',
diff --git a/config/environments/production.js.example b/config/environments/production.js.example
index df0b75eb..c0a63be9 100644
--- a/config/environments/production.js.example
+++ b/config/environments/production.js.example
@@ -170,7 +170,9 @@ var config = {
         },
         emitter: {
             statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
     ,varnish: {
         host: 'localhost',
diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example
index fd082a9c..69fa635b 100644
--- a/config/environments/staging.js.example
+++ b/config/environments/staging.js.example
@@ -170,7 +170,9 @@ var config = {
         },
         emitter: {
             statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
     ,varnish: {
         host: 'localhost',
diff --git a/config/environments/test.js.example b/config/environments/test.js.example
index 94b92807..5597509a 100644
--- a/config/environments/test.js.example
+++ b/config/environments/test.js.example
@@ -172,7 +172,9 @@ var config = {
         },
         emitter: {
             statusInterval: 5000 // time, in ms, between each status report is emitted from the pool, status is sent to statsd
-        }
+        },
+        unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
+        noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
     ,varnish: {
         host: '',