From c78823aa65334ef16cbc25bda666c7c719fb311d Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Wed, 3 Feb 2021 17:03:56 +0100 Subject: [PATCH] Replace GenericCache with new scoped_cache --- piwik/indico_piwik/reports.py | 6 +++--- vc_vidyo/indico_vc_vidyo/api/cache.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/piwik/indico_piwik/reports.py b/piwik/indico_piwik/reports.py index 099c630..bed5f8b 100644 --- a/piwik/indico_piwik/reports.py +++ b/piwik/indico_piwik/reports.py @@ -10,7 +10,7 @@ from datetime import timedelta from sqlalchemy.orm import joinedload -from indico.legacy.common.cache import GenericCache +from indico.core.cache import make_scoped_cache from indico.modules.attachments.util import get_nested_attached_items from indico.modules.events import Event from indico.modules.events.contributions import Contribution @@ -54,13 +54,13 @@ class ReportBase(Serializer): if not PiwikPlugin.settings.get('cache_enabled'): return cls(*args, **kwargs).to_serializable() - cache = GenericCache('Piwik.Report') + cache = make_scoped_cache('piwik-report') key = f'{cls.__name__}-{args}-{kwargs}' report = cache.get(key) if not report: report = cls(*args, **kwargs) - cache.set(key, report, PiwikPlugin.settings.get('cache_ttl')) + cache.set(key, report, timeout=PiwikPlugin.settings.get('cache_ttl')) return report.to_serializable() def _build_report(self): diff --git a/vc_vidyo/indico_vc_vidyo/api/cache.py b/vc_vidyo/indico_vc_vidyo/api/cache.py index 4c05836..83f83dd 100644 --- a/vc_vidyo/indico_vc_vidyo/api/cache.py +++ b/vc_vidyo/indico_vc_vidyo/api/cache.py @@ -7,7 +7,7 @@ from zeep.cache import Base -from indico.legacy.common.cache import GenericCache +from indico.core.cache import make_scoped_cache DEFAULT_CACHE_TTL = 24 * 3600 @@ -17,11 +17,11 @@ class ZeepCache(Base): _instance = None def __init__(self, duration=DEFAULT_CACHE_TTL): - self._cache = GenericCache("ZeepCache") + self._cache = make_scoped_cache('zeep') self._duration = duration def get(self, url): self._cache.get(url) def add(self, url, content): - self._cache.set(url, content, self._duration) + self._cache.set(url, content, timeout=self._duration)