update entrypoint and dataset setup, make cache optional

Author: tomkralidis

msc-wis2node-management/Dockerfile

@@ -25,7 +25,8 @@ ARG SR3_CONFIG /home/msc-wis2node/.config/sr3
 
 ENV TZ="Etc/UTC" \
     DEBIAN_FRONTEND="noninteractive" \
-    DEBIAN_PACKAGES="bash curl git python3-pip python3-setuptools sudo vim"
+    DEBIAN_PACKAGES="bash curl git python3-pip python3-setuptools sudo vim" \
+    MSC_WIS2NODE_DATASET_CONFIG=/home/msc-wis2node/datasets.yml
 
 # copy the app 
 COPY ./ /app

msc-wis2node-management/docker/entrypoint.sh

@@ -24,8 +24,10 @@ printenv | grep -v "no_proxy" > /tmp/environment
 sudo sh -c 'cat /tmp/environment >> /etc/environment'
 rm -f /tmp/environment
 
-echo "starting sr3..."
+echo "Setting up MSC dataset config"
+msc-wis2node dataset setup
 
+echo "starting sr3..."
 sr3 --logStdout start subscribe/dd.weather.gc.ca-all && sleep infinity
 
 echo "END /entrypoint.sh"

msc-wis2node-management/msc_wis2node/publisher.py

@@ -76,12 +76,15 @@ class WIS2Publisher:
     def __init__(self):
         """initialize"""
 
-        self.cache = memcache_base.Client(CACHE)
+        self.cache = None
         self.datasets = []
         self.tls = None
 
         self.client_id = get_mqtt_client_id()
 
+        if CACHE is not None:
+            self.cache = memcache_base.Client(CACHE)
+
         if BROKER_PORT == 8883:
             self.tls = get_mqtt_tls_settings()
 
@@ -181,14 +184,15 @@ def publish_to_wis2(self, dataset: dict, url: str) -> None:
             url=url
         )
 
-        LOGGER.debug('Checking for data update')
-        if self.cache.get(message['properties']['data_id']) is not None:
-            update_link = deepcopy(message['links'][0])
-            update_link['rel'] = 'update'
-            message['links'].append(update_link)
-        else:
-            self.cache.set(message['properties']['data_id'],
-                           CACHE_EXPIRY_SECONDS)
+        if self.cache is not None:
+            LOGGER.debug('Checking for data update')
+            if self.cache.get(message['properties']['data_id']) is not None:
+                update_link = deepcopy(message['links'][0])
+                update_link['rel'] = 'update'
+                message['links'].append(update_link)
+            else:
+                self.cache.set(message['properties']['data_id'],
+                               CACHE_EXPIRY_SECONDS)
 
         cache = dataset.get('cache', True)
         if not cache:

msc-wis2node-management/requirements.txt

@@ -3,3 +3,4 @@ certifi
 click
 metpx-sr3
 pywis-pubsub
+pymemcache