s/memcache/redis/g

Author: tomkralidis

README.md

@@ -57,7 +57,7 @@ vim local.env  # update accordingly
 # MSC_WIS2NODE_MSC_DATAMART_AMQP: URL to MSC Datamart notification service
 # MSC_WIS2NODE_DISCOVERY_METADATA_ZIP: zipfile of MSC discovery metadata (file or URL)
 # MSC_WIS2NODE_TOPIC_PREFIX: base topic prefix for publication (i.e. origin/a/wis2/ca-eccc-msc)
-# MSC_WIS2NODE_CACHE: optional memcache instance
+# MSC_WIS2NODE_CACHE: optional redis instance
 # MSC_WIS2NODE_CACHE_EXPIRY_SECONDS: number of seconds for cache items to expire (default 86400 [1 day])
 # MSC_WIS2NODE_CENTRE_ID: centre identifier
 # MSC_WIS2NODE_WIS2_GDC: URL to a WIS2 GDC (default is Canada GDC)
@@ -85,7 +85,7 @@ msc-wis2node dataset delete-metadata --metadata-id 12345
 
 The Docker setup uses Docker and Docker Compose to manage the following services:
 
-- **msc-wis2node-cache**: memcache caching for data update detection (optional)
+- **msc-wis2node-cache**: redis instance for data update detection (optional)
 - **msc-wis2node-management**: management service to subscribe to MSC Datamart/HPFX and re-publish to WIS2
 
 See [`msc-wis2node.env`](msc-wis2node.env) for default environment variable settings.

docker-compose.override.yml

@@ -20,4 +20,4 @@
 services:
   msc-wis2node-cache:
     ports:
-        - 11211:11211
+        - 6379:6379

docker-compose.yml

@@ -28,7 +28,7 @@ x-logging: &logging
 
 services:
   msc-wis2node-cache:
-    image: memcached:latest
+    image: redis:latest
     container_name: msc-wis2node-cache
     env_file:
       - msc-wis2node.env

msc-wis2node-management/msc_wis2node/publisher.py

@@ -27,8 +27,8 @@
 import uuid
 
 from paho.mqtt import publish
-from pymemcache.client import base as memcache_base
 from pywis_pubsub.publish import create_message
+import redis
 from sarracenia.flowcb import FlowCB
 import yaml
 
@@ -83,7 +83,7 @@ def __init__(self):
         self.client_id = get_mqtt_client_id()
 
         if CACHE is not None:
-            self.cache = memcache_base.Client(CACHE)
+            self.cache = redis.Redis().from_url(CACHE)
 
         if BROKER_PORT == 8883:
             self.tls = get_mqtt_tls_settings()
@@ -191,8 +191,8 @@ def publish_to_wis2(self, dataset: dict, url: str) -> None:
                 update_link['rel'] = 'update'
                 message['links'].append(update_link)
             else:
-                self.cache.set(message['properties']['data_id'],
-                               CACHE_EXPIRY_SECONDS)
+                self.cache.set(message['properties']['data_id'], 'published',
+                               ex=CACHE_EXPIRY_SECONDS)
 
         cache = dataset.get('cache', True)
         if not cache:

msc-wis2node-management/requirements.txt

@@ -3,4 +3,4 @@ certifi
 click
 metpx-sr3
 pywis-pubsub
-pymemcache
+redis[hiredis]