# HG changeset patch # User Thierry Florac # Date 1496820683 -7200 # Node ID 7dea2cd0fa8a694f56dc3aa4230c489baa6bb9ca # Parent cfac2a5b97bc0fa72185f2432f0ee964e1586ffb Use pyams_cache cache handler interface diff -r cfac2a5b97bc -r 7dea2cd0fa8a src/pyams_notify/views/notification.py --- a/src/pyams_notify/views/notification.py Wed Jun 07 09:30:54 2017 +0200 +++ b/src/pyams_notify/views/notification.py Wed Jun 07 09:31:23 2017 +0200 @@ -15,16 +15,14 @@ # import standard library import pickle -try: - import pylibmc -except ImportError: - pylibmc = None # import interfaces -from pyams_notify.interfaces import MEMCACHED_QUEUE_KEY +from pyams_cache.interfaces import ICacheHandler +from pyams_notify.interfaces import CACHE_QUEUE_KEY, CACHE_CONFIGURATION_KEY from pyams_skin.layer import IPyAMSLayer # import packages +from pyams_cache.cache import get_cache_handler from pyramid.view import view_config @@ -42,16 +40,16 @@ self.context = request.context @property - def memcached_server(self): - return self.request.registry.settings.get('pyams_notify_ws.memcached_server') + def cache_server(self): + return self.request.registry.settings.get(CACHE_CONFIGURATION_KEY) def __call__(self): - if pylibmc is None: - return () - server = self.memcached_server + server = self.cache_server if server is not None: - client = pylibmc.Client([server]) - notifications = client.get(MEMCACHED_QUEUE_KEY) + client = get_cache_handler(server, ICacheHandler) + if client is None: + return () + notifications = client.get(CACHE_QUEUE_KEY) if notifications is None: return () else: