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

Take the environment into account

Browse Source
This commit is contained in:
Rafa de la Torre 2016-09-30 11:29:44 +02:00
parent 1e6ee8d5c1
commit e24819f193
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/extension/sql/20_geocode_street.sql
View File

@ -145,15 +145,21 @@ RETURNS Geometry AS $$
from cartodb_services.tools import Logger from cartodb_services.tools import Logger
from cartodb_services.refactor.storage.server_config import InDbServerConfigStorage, UserConfigStorageFactory, OrgConfigStorageFactory from cartodb_services.refactor.storage.server_config import InDbServerConfigStorage, UserConfigStorageFactory, OrgConfigStorageFactory
from cartodb_services.refactor.tools.logger import LoggerConfigBuilder from cartodb_services.refactor.tools.logger import LoggerConfigBuilder
from cartodb_services.refactor.storage.redis_config import RedisMetadataConnectionConfigBuilder from cartodb_services.refactor.storage.redis_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder
from cartodb_services.refactor.storage.redis_connection import RedisConnectionBuilder from cartodb_services.refactor.storage.redis_connection import RedisConnectionBuilder
from cartodb_services.refactor.service.mapzen_geocoder import MapzenGeocoderConfigBuilder from cartodb_services.refactor.service.mapzen_geocoder import MapzenGeocoderConfigBuilder
from cartodb_services.refactor.core.environment import Environment
server_config_storage = InDbServerConfigStorage() server_config_storage = InDbServerConfigStorage()
logger_config = LoggerConfigBuilder(server_config_storage).get() logger_config = LoggerConfigBuilder(server_config_storage).get()
logger = Logger(logger_config) logger = Logger(logger_config)
# TODO encapsulate construction of user_config_storage and org_config_storage
environment = Environment(server_config_storage).get()
if environment == 'onpremise':
user_config_storage = org_config_storage = server_config_storage
else:
redis_metadata_connection_config = RedisMetadataConnectionConfigBuilder(server_config_storage).get() redis_metadata_connection_config = RedisMetadataConnectionConfigBuilder(server_config_storage).get()
redis_metadata_connection = RedisConnectionBuilder(redis_metadata_connection_config).get() redis_metadata_connection = RedisConnectionBuilder(redis_metadata_connection_config).get()
user_config_storage = UserConfigStorageFactory(redis_metadata_connection, username).get() user_config_storage = UserConfigStorageFactory(redis_metadata_connection, username).get()
@ -162,10 +168,15 @@ RETURNS Geometry AS $$
# TODO rename this variable # TODO rename this variable
user_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get() user_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get()
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection'] # TODO encapsulate the connection creation
# TODO implement the RedisConnectionMock
if environment == 'onpremise':
redis_metrics_connection = RedisConnectionMock()
else:
redis_metrics_connection_config = RedisMetricsConnectionConfigBuilder(server_config_storage).get()
redis_metrics_connection = RedisConnectionBuilder(redis_metrics_connection_config).get()
quota_service = QuotaService(user_geocoder_config, redis_metrics_connection)
quota_service = QuotaService(user_geocoder_config, redis_conn)
if not quota_service.check_user_quota(): if not quota_service.check_user_quota():
raise Exception('You have reached the limit of your quota') raise Exception('You have reached the limit of your quota')