From c3c28dfd5ea457734bd5e6f973708ab2202725b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Ignacio=20S=C3=A1nchez=20Lara?= Date: Wed, 11 Apr 2018 12:14:11 +0200 Subject: [PATCH] Simpler quota check matching --- .../cartodb_services/metrics/quota.py | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py b/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py index 07a4c2d..6b3ca3b 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py @@ -69,31 +69,16 @@ class QuotaChecker: def check(self): """ Check if the current user quota surpasses the current quota """ - if re.match('geocoder_*', + if re.match('^geocoder_', self._user_service_config.service_type) is not None: return self.__check_geocoder_quota() - elif re.match('here_isolines', + elif re.match('_isolines$', self._user_service_config.service_type) is not None: return self.__check_isolines_quota() - elif re.match('mapzen_isolines', - self._user_service_config.service_type) is not None: - return self.__check_isolines_quota() - elif re.match('mapbox_isolines', - self._user_service_config.service_type) is not None: - return self.__check_isolines_quota() - elif re.match('tomtom_isolines', - self._user_service_config.service_type) is not None: - return self.__check_isolines_quota() - elif re.match('routing_mapzen', + elif re.match('^routing_', self._user_service_config.service_type) is not None: return self.__check_routing_quota() - elif re.match('routing_mapbox', - self._user_service_config.service_type) is not None: - return self.__check_routing_quota() - elif re.match('routing_tomtom', - self._user_service_config.service_type) is not None: - return self.__check_routing_quota() - elif re.match('obs_*', + elif re.match('^obs_', self._user_service_config.service_type) is not None: return self.__check_data_observatory_quota() else: