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 234b05c..05dd79e 100644 --- a/server/lib/python/cartodb_services/cartodb_services/metrics/config.py +++ b/server/lib/python/cartodb_services/cartodb_services/metrics/config.py @@ -15,6 +15,7 @@ class ServiceConfig(object): self._username = username self._orgname = orgname self._db_config = ServicesDBConfig(db_conn, username, orgname) + self._environment = self._db_config._server_environment if redis_connection: self._redis_config = ServicesRedisConfig(redis_connection).build( username, orgname) @@ -33,6 +34,10 @@ class ServiceConfig(object): def organization(self): return self._orgname + @property + def environment(self): + return self._environment + class DataObservatoryConfig(ServiceConfig): def __init__(self, redis_connection, db_conn, username, orgname=None): @@ -400,11 +405,23 @@ class ServicesDBConfig: return self._build() def _build(self): + self._get_server_config() self._get_here_config() self._get_mapzen_config() self._get_logger_config() self._get_data_observatory_config() + def _get_server_config(self): + server_config_json = self._get_conf('server_conf') + if not server_config_json: + self._server_environment = 'production' + else: + server_config_json = json.loads(server_config_json) + if 'environment' in server_config_json: + self._server_environment = server_config_json['environment'] + else: + self._server_environment = 'production' + def _get_here_config(self): heremaps_conf_json = self._get_conf('heremaps_conf') if not heremaps_conf_json: @@ -460,6 +477,10 @@ class ServicesDBConfig: except Exception as e: raise ConfigException("Malformed config for {0}: {1}".format(key, e)) + @property + def server_environment(self): + return self._server_environment + @property def heremaps_isolines_app_id(self): return self._heremaps_isolines_app_id