update caching logic, add dep

Author: tomkralidis

msc-wis2node-management/msc_wis2node/publisher.py

@@ -183,13 +183,6 @@ def publish_to_wis2(self, dataset: dict, url: str) -> None:
             url=url
         )
 
-        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)
-
         cache = dataset.get('cache', True)
         if not cache:
             LOGGER.info(f'Setting properties.cache={cache}')
@@ -200,6 +193,13 @@ def publish_to_wis2(self, dataset: dict, url: str) -> None:
         tokens = data_id.split('/')
         message['properties']['data_id'] = '/'.join(tokens[2:])
 
+        if self.cache is not None:
+            LOGGER.info(f"Checking for duplicate: {message['properties']['data_id']}")  # noqa
+            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)
+
         LOGGER.info(json.dumps(message, indent=4))
         msg = (f'Publishing WIS2 notification message to '
                f'host={BROKER_HOSTNAME}, port={BROKER_PORT}, topic={topic}')
@@ -220,7 +220,7 @@ def publish_to_wis2(self, dataset: dict, url: str) -> None:
         )
 
         if self.cache is not None:
-            LOGGER.debug('Setting cache key')
+            LOGGER.info(f"Setting cache key for {message['properties']['data_id']}")  # noqa
             self.cache.set(message['properties']['data_id'], 'published',
                            ex=CACHE_EXPIRY_SECONDS)
 

msc-wis2node-management/requirements.txt

@@ -2,5 +2,6 @@ amqp
 certifi
 click
 metpx-sr3
+paramiko
 pywis-pubsub
 redis[hiredis]