From f9f39dcf9c7544d45dbc6f2d28bb1ee6ba90c9bb Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 1 Aug 2016 13:17:06 +0200 Subject: [PATCH] Refactor metrics logger --- .../cartodb_services/cartodb_services/metrics/log.py | 10 +++++----- .../cartodb_services/cartodb_services/metrics/quota.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/metrics/log.py b/server/lib/python/cartodb_services/cartodb_services/metrics/log.py index 1617368..ab4739e 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/log.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/log.py @@ -4,17 +4,17 @@ import json import re -class LoggerFactory: +class MetricsLoggerFactory: @classmethod def build(self, service_config): if re.match('geocoder_*', service_config.service_type): - return GeocoderLogger(service_config) + return MetricsGeocoderLogger(service_config) else: return None -class Logger(object): +class MetricsLogger(object): __metaclass__ = abc.ABCMeta def __init__(self, file_path): @@ -30,10 +30,10 @@ class Logger(object): raise NotImplementedError('log method must be defined') -class GeocoderLogger(Logger): +class MetricsGeocoderLogger(MetricsLogger): def __init__(self, service_config): - super(GeocoderLogger, self).__init__(service_config.log_path) + super(MetricsGeocoderLogger, self).__init__(service_config.log_path) self._service_config = service_config def log(self, **data): 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 4496e3c..13aefc7 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/quota.py @@ -1,5 +1,5 @@ from user import UserMetricsService -from log import LoggerFactory +from log import MetricsLoggerFactory from datetime import date import re @@ -14,7 +14,7 @@ class QuotaService: redis_connection) self._user_service = UserMetricsService(self._user_service_config, redis_connection) - self._logger = LoggerFactory.build(user_service_config) + self._metrics_logger = MetricsLoggerFactory.build(user_service_config) def check_user_quota(self): return self._quota_checker.check() @@ -48,11 +48,11 @@ class QuotaService: amount=amount) def _log_service_process(self, event): - if self._logger: + if self._metrics_logger: if event is 'success' or event is 'empty': - self._logger.log(success=True) + self._metrics_logger.log(success=True) elif event is 'empty': - self._logger.log(success=False) + self._metrics_logger.log(success=False) class QuotaChecker: