From 15ff997e38348e15aedaff142c969b1f0235151e Mon Sep 17 00:00:00 2001 From: Colin Rolfe Date: Fri, 8 Feb 2019 15:21:49 -0800 Subject: [PATCH] Remove line that sets KEY_PREFIX inside of update_cache_from_env. This setting is not set inside of middleware.py, and we should not override a standard Django setting. By doing this, we make it possible to generate different cache keys in one process vs another. --- db_multitenant/utils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/db_multitenant/utils.py b/db_multitenant/utils.py index fc06af2..6465aae 100644 --- a/db_multitenant/utils.py +++ b/db_multitenant/utils.py @@ -8,11 +8,13 @@ _CACHED_MAPPER = None + def update_from_env(database_settings=None, cache_settings=None): update_database_from_env(database_settings) update_cache_from_env(cache_settings) update_tenant_name_from_env() + def update_database_from_env(database_settings): from django.db import connection db_name = os.environ.get('TENANT_DATABASE_NAME') @@ -20,19 +22,21 @@ def update_database_from_env(database_settings): database_settings['NAME'] = db_name connection.get_threadlocal().set_db_name(db_name) + def update_cache_from_env(cache_settings): from django.db import connection cache_prefix = os.environ.get('TENANT_CACHE_PREFIX') if cache_prefix is not None and cache_settings is not None: - cache_settings['KEY_PREFIX'] = cache_prefix connection.get_threadlocal().set_cache_prefix(cache_prefix) + def update_tenant_name_from_env(): from django.db import connection tenant_name = os.environ.get('TENANT_NAME') if tenant_name: connection.get_threadlocal().set_tenant_name(tenant_name) + def get_mapper(): """Returns the mapper.""" global _CACHED_MAPPER