add requested changes

wmo-im · Mar 13, 2024 · a2b39f7 · a2b39f7
1 parent ee8804b
commit a2b39f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/wis2box-management/Dockerfile b/wis2box-management/Dockerfile
@@ -21,6 +21,8 @@
 
 FROM ubuntu:focal
 
+LABEL maintainer="tomkralidis@gmail.com; mlimper@wmo.int"
+
 ARG WIS2BOX_PIP3_EXTRA_PACKAGES
 ENV TZ="Etc/UTC" \
     DEBIAN_FRONTEND="noninteractive" \

diff --git a/wis2box-management/wis2box/api/__init__.py b/wis2box-management/wis2box/api/__init__.py
@@ -80,7 +80,7 @@ def execute_api_process(process_name: str, payload: dict) -> dict:
     location = location.replace(API_URL, DOCKER_API_URL)
 
     status = 'accepted'
-    while status == 'accepted' or status == 'running':
+    while status in ['accepted', 'running']:
         # get the job status
         headers = {
             'accept': 'application/json',

diff --git a/wis2box-management/wis2box/data/bufr2geojson.py b/wis2box-management/wis2box/data/bufr2geojson.py
@@ -59,11 +59,11 @@ def transform(self, input_data: Union[Path, bytes],
         result = execute_api_process(process_name, payload)
 
         # check for errors
-        if 'error' in result and result['error'] != '':
+        if result.get('error') not in [None, '']:
             LOGGER.error(result['error'])
 
         if 'items' not in result:
-            LOGGER.error(f'file={filename} failed to convert to geojson')
+            LOGGER.error(f'file={filename} failed to convert to GeoJSON')
             return False
 
         # loop over items in response

diff --git a/wis2box-management/wis2box/pubsub/subscribe.py b/wis2box-management/wis2box/pubsub/subscribe.py
@@ -121,7 +121,7 @@ def on_message_handler(self, client, userdata, msg):
             while len(mp.active_children()) == mp.cpu_count():
                 sleep(0.1)
             mp.Process(target=self.handle, args=(filepath,)).start()
-        elif (topic == 'wis2box/data/publication'):
+        elif topic == 'wis2box/data/publication':
             LOGGER.debug('Publishing data')
             self.handle_publish(message)
         elif topic == 'wis2box/data_mappings/refresh':