From bb17b3bff7ad46c4262c9f982897d6a6f8c6dfed Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 16 May 2016 14:12:12 +0200 Subject: [PATCH] Hotifix: obs_general_quota logic missing in the redis config --- .../cartodb_services/metrics/config.py | 3 +++ server/lib/python/cartodb_services/setup.py | 2 +- server/lib/python/cartodb_services/test/test_helper.py | 10 +++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) 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 b1f110f..5ecb832 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py @@ -470,6 +470,7 @@ class ServicesRedisConfig: QUOTA_KEY = 'geocoding_quota' ISOLINES_QUOTA_KEY = 'here_isolines_quota' OBS_SNAPSHOT_QUOTA_KEY = 'obs_snapshot_quota' + OBS_GENERAL_QUOTA_KEY = 'obs_general_quota' PERIOD_END_DATE = 'period_end_date' def __init__(self, redis_conn): @@ -498,6 +499,8 @@ class ServicesRedisConfig: user_config[self.ISOLINES_QUOTA_KEY] = org_config[self.ISOLINES_QUOTA_KEY] if self.OBS_SNAPSHOT_QUOTA_KEY in org_config: user_config[self.OBS_SNAPSHOT_QUOTA_KEY] = org_config[self.OBS_SNAPSHOT_QUOTA_KEY] + if self.OBS_GENERAL_QUOTA_KEY in org_config: + user_config[self.OBS_GENERAL_QUOTA_KEY] = org_config[self.OBS_GENERAL_QUOTA_KEY] user_config[self.PERIOD_END_DATE] = org_config[self.PERIOD_END_DATE] user_config[self.GOOGLE_GEOCODER_CLIENT_ID] = org_config[self.GOOGLE_GEOCODER_CLIENT_ID] user_config[self.GOOGLE_GEOCODER_API_KEY] = org_config[self.GOOGLE_GEOCODER_API_KEY] diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 3254050..4d16964 100644 --- a/server/lib/python/cartodb_services/setup.py +++ b/server/lib/python/cartodb_services/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages setup( name='cartodb_services', - version='0.6.0', + version='0.6.1', description='CartoDB Services API Python Library', diff --git a/server/lib/python/cartodb_services/test/test_helper.py b/server/lib/python/cartodb_services/test/test_helper.py index e13fa65..e1ffdb8 100644 --- a/server/lib/python/cartodb_services/test/test_helper.py +++ b/server/lib/python/cartodb_services/test/test_helper.py @@ -5,6 +5,7 @@ from mock import Mock def build_redis_user_config(redis_conn, username, quota=100, soft_limit=False, service="heremaps", isolines_quota=0, do_quota=None, soft_do_limit=None, + do_general_quota=None, soft_do_general_limit=None, end_date=datetime.today()): user_redis_name = "rails:users:{0}".format(username) redis_conn.hset(user_redis_name, 'soft_geocoding_limit', soft_limit) @@ -17,18 +18,25 @@ def build_redis_user_config(redis_conn, username, quota=100, soft_limit=False, if soft_do_limit: redis_conn.hset(user_redis_name, 'soft_obs_snapshot_limit', soft_do_limit) + if do_general_quota: + redis_conn.hset(user_redis_name, 'obs_general_quota', do_general_quota) + if soft_do_general_limit: + redis_conn.hset(user_redis_name, 'soft_obs_general_limit', + soft_do_general_limit) redis_conn.hset(user_redis_name, 'google_maps_client_id', '') redis_conn.hset(user_redis_name, 'google_maps_api_key', '') def build_redis_org_config(redis_conn, orgname, quota=100, service="heremaps", isolines_quota=0, do_quota=None, - end_date=datetime.today()): + do_general_quota=None, end_date=datetime.today()): org_redis_name = "rails:orgs:{0}".format(orgname) redis_conn.hset(org_redis_name, 'geocoding_quota', quota) redis_conn.hset(org_redis_name, 'here_isolines_quota', isolines_quota) if do_quota: redis_conn.hset(org_redis_name, 'obs_snapshot_quota', do_quota) + if do_general_quota: + redis_conn.hset(org_redis_name, 'obs_snapshot_quota', do_quota) redis_conn.hset(org_redis_name, 'period_end_date', end_date) redis_conn.hset(org_redis_name, 'google_maps_client_id', '') redis_conn.hset(org_redis_name, 'google_maps_api_key', '')