From 524d15c1a9b53a176656d019bf98b3be78ff90ca Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Thu, 30 Mar 2017 18:10:53 +0200 Subject: [PATCH] Fix uses of cartodb cdb_conf functions --- .../cartodb_services/config/legacy_rate_limits.py | 2 +- .../python/cartodb_services/cartodb_services/metrics/config.py | 2 +- .../lib/python/cartodb_services/cartodb_services/tools/log.py | 2 +- .../cartodb_services/cartodb_services/tools/redis_tools.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py b/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py index e50da06..11632f9 100644 --- a/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py +++ b/server/lib/python/cartodb_services/cartodb_services/config/legacy_rate_limits.py @@ -32,7 +32,7 @@ class RateLimitsConfigLegacyBuilder(object): rate_limit = json.loads(rate_limit_json) else: conf_key = 'rate_limits' - sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(conf_key) + sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(conf_key) try: conf = self._db_conn.execute(sql, 1)[0]['conf'] except Exception: diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py index f3e93d0..8a8456c 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py @@ -551,7 +551,7 @@ class ServicesDBConfig: def _get_conf(self, key): try: - sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key) + sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(key) conf = self._db_conn.execute(sql, 1) return conf[0]['conf'] except Exception as e: diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/log.py b/server/lib/python/cartodb_services/cartodb_services/tools/log.py index 5319ce3..40e3eec 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tools/log.py +++ b/server/lib/python/cartodb_services/cartodb_services/tools/log.py @@ -185,7 +185,7 @@ class LoggerConfig: def _get_conf(self, key): try: - sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key) + sql = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format(key) conf = self._db_conn.execute(sql, 1) return conf[0]['conf'] except Exception as e: diff --git a/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py b/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py index 7cbc375..e8b5800 100644 --- a/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py +++ b/server/lib/python/cartodb_services/cartodb_services/tools/redis_tools.py @@ -37,7 +37,7 @@ class RedisDBConfig: return self._build(key) def _build(self, key): - conf_query = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format( + conf_query = "SELECT cdb_dataservices_server.CDB_Conf_GetConf('{0}') as conf".format( key) conf = self._db_conn.execute(conf_query)[0]['conf'] if conf is None: