cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with db config default arguments

Browse Source
This commit is contained in:
Javier Goizueta
2017-03-15 12:46:25 +01:00
parent 05b29967c7
commit 77b5ff0b9e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/python/cartodb_services/cartodb_services/metrics/config.py
+10 -6
View File
@@ -563,17 +563,21 @@ class ServicesDBConfig:
self._data_observatory_connection_str = do_conf['connection']['production'] self._data_observatory_connection_str = do_conf['connection']['production']
def _get_rate_limits_config(self): def _get_rate_limits_config(self):
self._rate_limits = json.loads(self._get_conf('rate_limits', default='{}')) # self._rate_limits = json.loads(self._get_conf('rate_limits', default='{}'))
rl = self._get_conf('rate_limits', default='{}')
self._rate_limits = json.loads(rl)
def _get_conf(self, key, default=KeyError): def _get_conf(self, key, default=KeyError):
try: try:
sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key) sql = "SELECT cartodb.CDB_Conf_GetConf('{0}') as conf".format(key)
conf = self._db_conn.execute(sql, 1) conf = self._db_conn.execute(sql, 1)[0]['conf']
return conf[0]['conf'] if default != KeyError:
conf = conf or default
return conf
except Exception as e: except Exception as e:
if (default != KeyError): if (default == KeyError):
return default raise ConfigException("Error trying to get config for {0}: {1}".format(key, e))
raise ConfigException("Error trying to get config for {0}: {1}".format(key, e)) return default
@property @property
def server_environment(self): def server_environment(self):