From 30d31dcc8961eb8090fe900298be43910c8ed98c Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 29 May 2019 19:01:31 +0200 Subject: [PATCH 3/6] stop threading wrapped around (#33563) --- hobo/multitenant/settings.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hobo/multitenant/settings.py b/hobo/multitenant/settings.py index 96c0fb1..19d30ef 100644 --- a/hobo/multitenant/settings.py +++ b/hobo/multitenant/settings.py @@ -44,8 +44,7 @@ class TenantSettingsWrapper(object): loader_class = import_class(loader) yield loader_class() - def load_tenant_settings(self, wrapped, tenant, tenant_settings, - last_time): + def load_tenant_settings(self, tenant, tenant_settings, last_time): '''Load tenant settings from loaders into tenant_settings object, only if any of the loaders say it is more recent than last update time''' update_time = time.time() @@ -67,7 +66,7 @@ class TenantSettingsWrapper(object): return tenant_settings, update_time return tenant_settings, last_time - def get_tenant_settings(self, wrapped, tenant): + def get_tenant_settings(self, tenant): '''Get last loaded settings for tenant, try to update it by loading settings again is last loading time is less recent thant settings data store. Compare with last modification time is done in the @@ -76,9 +75,8 @@ class TenantSettingsWrapper(object): tenant_settings, last_time = self.tenants_settings.get( tenant.domain_url, (None, None)) if tenant_settings is None: - tenant_settings = UserSettingsHolder(wrapped) - tenant_settings, last_time = self.load_tenant_settings( - wrapped, tenant, tenant_settings, last_time) + tenant_settings = UserSettingsHolder(self.default_settings) + tenant_settings, last_time = self.load_tenant_settings(tenant, tenant_settings, last_time) self.tenants_settings[tenant.domain_url] = tenant_settings, last_time return tenant_settings @@ -90,7 +88,7 @@ class TenantSettingsWrapper(object): tenant = connection.get_tenant() if not hasattr(tenant, 'domain_url'): return self.default_settings - return self.get_tenant_settings(self.default_settings, tenant) + return self.get_tenant_settings(tenant) finally: self.local.in_get_wrapped = False -- 2.20.1