From 9a364456610add3e91e030f3440e408e1afb7872 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Wed, 24 Feb 2016 17:22:42 +0100
Subject: [PATCH] Sentinel id could be removed safely from the config

Removing the sentinel_master_id property from the cdb_conf
redis config, the extension is going to use a single redis instance
instead of Sentinel
---
 .../extension/cdb_dataservices_server--0.4.0--0.5.0.sql  | 9 +++++++--
 server/extension/cdb_dataservices_server--0.5.0.sql      | 9 +++++++--
 server/extension/sql/0.5.0/10_redis_helper.sql           | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql b/server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql
index 06abdb3..fedc7df 100644
--- a/server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql
+++ b/server/extension/cdb_dataservices_server--0.4.0--0.5.0.sql
@@ -13,13 +13,18 @@ RETURNS cdb_dataservices_server._redis_conf_params AS $$
     else:
       import json
       params = json.loads(conf)
-      return {
-        "sentinel_master_id": params['sentinel_master_id'],
+      redis_conf_params = {
         "redis_host": params['redis_host'],
         "redis_port": params['redis_port'],
         "timeout": params['timeout'],
         "redis_db": params['redis_db']
       }
+      if "sentinel_master_id" in params:
+        redis_conf_params["sentinel_master_id"] = params["sentinel_master_id"]
+      else:
+        redis_conf_params["sentinel_master_id"] = None
+
+      return redis_conf_params
 $$ LANGUAGE plpythonu;
 
 -- Get the connection to redis from cache or create a new one
diff --git a/server/extension/cdb_dataservices_server--0.5.0.sql b/server/extension/cdb_dataservices_server--0.5.0.sql
index 9d1d8f6..ccbc582 100644
--- a/server/extension/cdb_dataservices_server--0.5.0.sql
+++ b/server/extension/cdb_dataservices_server--0.5.0.sql
@@ -92,13 +92,18 @@ RETURNS cdb_dataservices_server._redis_conf_params AS $$
     else:
       import json
       params = json.loads(conf)
-      return {
-        "sentinel_master_id": params['sentinel_master_id'],
+      redis_conf_params = {
         "redis_host": params['redis_host'],
         "redis_port": params['redis_port'],
         "timeout": params['timeout'],
         "redis_db": params['redis_db']
       }
+      if "sentinel_master_id" in params:
+        redis_conf_params["sentinel_master_id"] = params["sentinel_master_id"]
+      else:
+        redis_conf_params["sentinel_master_id"] = None
+
+      return redis_conf_params
 $$ LANGUAGE plpythonu;
 
 -- Get the connection to redis from cache or create a new one
diff --git a/server/extension/sql/0.5.0/10_redis_helper.sql b/server/extension/sql/0.5.0/10_redis_helper.sql
index 97223f4..77f3b01 100644
--- a/server/extension/sql/0.5.0/10_redis_helper.sql
+++ b/server/extension/sql/0.5.0/10_redis_helper.sql
@@ -16,13 +16,18 @@ RETURNS cdb_dataservices_server._redis_conf_params AS $$
     else:
       import json
       params = json.loads(conf)
-      return {
-        "sentinel_master_id": params['sentinel_master_id'],
+      redis_conf_params = {
         "redis_host": params['redis_host'],
         "redis_port": params['redis_port'],
         "timeout": params['timeout'],
         "redis_db": params['redis_db']
       }
+      if "sentinel_master_id" in params:
+        redis_conf_params["sentinel_master_id"] = params["sentinel_master_id"]
+      else:
+        redis_conf_params["sentinel_master_id"] = None
+
+      return redis_conf_params
 $$ LANGUAGE plpythonu;
 
 -- Get the connection to redis from cache or create a new one