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

Rename redis conf factories to builders

Browse Source
This commit is contained in:
Rafa de la Torre
2016-10-03 15:25:01 +02:00
parent 275a6dc27f
commit 8fbb41742c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/sql/20_geocode_street.sql
+3 -3
View File
@@ -144,7 +144,7 @@ RETURNS Geometry AS $$
from cartodb_services.metrics import QuotaService from cartodb_services.metrics import QuotaService
from cartodb_services.tools import Logger from cartodb_services.tools import Logger
from cartodb_services.refactor.storage.server_config import InDbServerConfigStorage from cartodb_services.refactor.storage.server_config import InDbServerConfigStorage
from cartodb_services.refactor.storage.redis_config import UserConfigStorageFactory, OrgConfigStorageFactory from cartodb_services.refactor.storage.redis_config import RedisUserConfigStorageBuilder, RedisOrgConfigStorageBuilder
from cartodb_services.refactor.tools.logger import LoggerConfigBuilder from cartodb_services.refactor.tools.logger import LoggerConfigBuilder
from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock
from cartodb_services.refactor.storage.redis_connection_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder from cartodb_services.refactor.storage.redis_connection_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder
@@ -164,8 +164,8 @@ RETURNS Geometry AS $$
else: 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 = RedisUserConfigStorageBuilder(redis_metadata_connection, username).get()
org_config_storage = OrgConfigStorageFactory(redis_metadata_connection, orgname).get() org_config_storage = RedisOrgConfigStorageBuilder(redis_metadata_connection, orgname).get()
mapzen_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get() mapzen_geocoder_config = MapzenGeocoderConfigBuilder(server_config_storage, user_config_storage, org_config_storage, username, orgname).get()
server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_config.py
+2 -2
View File
@@ -15,7 +15,7 @@ class RedisConfigStorage(ConfigStorageInterface):
return self._data[key] return self._data[key]
class UserConfigStorageFactory(object): class RedisUserConfigStorageBuilder(object):
# TODO rework to support onpremise and InDbStorage # TODO rework to support onpremise and InDbStorage
def __init__(self, redis_connection, username): def __init__(self, redis_connection, username):
self._redis_connection = redis_connection self._redis_connection = redis_connection
@@ -25,7 +25,7 @@ class UserConfigStorageFactory(object):
return RedisConfigStorage(self._redis_connection, 'rails:users:{0}'.format(self._username)) return RedisConfigStorage(self._redis_connection, 'rails:users:{0}'.format(self._username))
class OrgConfigStorageFactory(object): class RedisOrgConfigStorageBuilder(object):
# TODO rework to support onpremise and InDbStorage # TODO rework to support onpremise and InDbStorage
def __init__(self, redis_connection, orgname): def __init__(self, redis_connection, orgname):
self._redis_connection = redis_connection self._redis_connection = redis_connection