# HG changeset patch # User Thierry Florac # Date 1540284514 -7200 # Node ID 4e7e71858d1c21c373629f53bc19fb6b657d5209 # Parent 3a608029647ecd42f5d1e32137c1c3ed854d36f1 Use hostname in portlets cache key diff -r 3a608029647e -r 4e7e71858d1c src/pyams_content/features/footer/skin/__init__.py --- a/src/pyams_content/features/footer/skin/__init__.py Mon Oct 22 17:10:16 2018 +0200 +++ b/src/pyams_content/features/footer/skin/__init__.py Tue Oct 23 10:48:34 2018 +0200 @@ -12,27 +12,23 @@ __docformat__ = 'restructuredtext' - -# import standard library import logging logger = logging.getLogger('PyAMS (content)') -# import interfaces -from pyams_content.features.footer.interfaces import IFooterTarget, IFooterRenderer, IFooterSettings +from pyramid.decorator import reify +from zope.interface import implementer + +from pyams_cache.beaker import get_cache +from pyams_content.features.footer.interfaces import IFooterRenderer, IFooterSettings, IFooterTarget from pyams_content.features.renderer.interfaces import HIDDEN_RENDERER_NAME +from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_portal.interfaces import PREVIEW_MODE +from pyams_portal.portlet import PORTLETS_CACHE_KEY, PORTLETS_CACHE_NAME, PORTLETS_CACHE_REGION from pyams_skin.layer import IPyAMSLayer +from pyams_utils.adapter import adapter_config from pyams_utils.interfaces import ICacheKeyValue from pyams_utils.interfaces.url import DISPLAY_CONTEXT - -# import packages -from pyams_cache.beaker import get_cache -from pyams_content.features.renderer.skin import BaseContentRenderer -from pyams_portal.portlet import PORTLETS_CACHE_REGION, PORTLETS_CACHE_NAME, PORTLETS_CACHE_KEY -from pyams_utils.adapter import adapter_config from pyams_utils.traversing import get_parent -from pyramid.decorator import reify -from zope.interface import implementer from pyams_content import _ @@ -64,6 +60,7 @@ @reify def cache_key(self): return PORTLETS_CACHE_KEY.format(portlet=self.name, + hostname=self.request.host, context=ICacheKeyValue(self.settings_target), lang=self.request.locale_name) diff -r 3a608029647e -r 4e7e71858d1c src/pyams_content/features/header/skin/__init__.py --- a/src/pyams_content/features/header/skin/__init__.py Mon Oct 22 17:10:16 2018 +0200 +++ b/src/pyams_content/features/header/skin/__init__.py Tue Oct 23 10:48:34 2018 +0200 @@ -12,27 +12,23 @@ __docformat__ = 'restructuredtext' - -# import standard library import logging logger = logging.getLogger('PyAMS (content)') -# import interfaces -from pyams_content.features.header.interfaces import IHeaderTarget, IHeaderRenderer, IHeaderSettings +from pyramid.decorator import reify +from zope.interface import implementer + +from pyams_cache.beaker import get_cache +from pyams_content.features.header.interfaces import IHeaderRenderer, IHeaderSettings, IHeaderTarget from pyams_content.features.header.skin.interfaces import IHeaderClass from pyams_content.features.renderer.interfaces import HIDDEN_RENDERER_NAME +from pyams_content.features.renderer.skin import BaseContentRenderer from pyams_portal.interfaces import PREVIEW_MODE +from pyams_portal.portlet import PORTLETS_CACHE_KEY, PORTLETS_CACHE_NAME, PORTLETS_CACHE_REGION from pyams_skin.layer import IPyAMSLayer +from pyams_utils.adapter import adapter_config from pyams_utils.interfaces import ICacheKeyValue - -# import packages -from pyams_cache.beaker import get_cache -from pyams_content.features.renderer.skin import BaseContentRenderer -from pyams_portal.portlet import PORTLETS_CACHE_REGION, PORTLETS_CACHE_NAME, PORTLETS_CACHE_KEY -from pyams_utils.adapter import adapter_config from pyams_utils.traversing import get_parent -from pyramid.decorator import reify -from zope.interface import implementer from pyams_content import _ @@ -64,6 +60,7 @@ @reify def cache_key(self): return PORTLETS_CACHE_KEY.format(portlet=self.name, + hostname=self.request.host, context=ICacheKeyValue(self.settings_target), lang=self.request.locale_name)