subscribe to both origin and cache

wmo-im · Jun 3, 2024 · e51f4de · e51f4de
1 parent 92b03aa
commit e51f4de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/wis2-grep-management/docker/pywis-pubsub.yml b/wis2-grep-management/docker/pywis-pubsub.yml
@@ -1,7 +1,8 @@
 broker: ${WIS2_GREP_GB}
 
 subscribe_topics:
-    - ${WIS2_GREP_GB_TOPIC}
+    - origin/a/wis2/#
+    - cache/a/wis2/#
 
 qos: 1
 

diff --git a/wis2-grep-management/wis2_grep/env.py b/wis2-grep-management/wis2_grep/env.py
@@ -49,8 +49,7 @@ def str2bool(value: Any) -> bool:
 BACKEND_CONNECTION = os.environ.get('WIS2_GREP_BACKEND_CONNECTION')
 CENTRE_ID = os.environ.get('WIS2_GREP_CENTRE_ID')
 GB = os.environ.get('WIS2_GREP_GB')
-GB_TOPIC = os.environ.get('WIS2_GREP_GB_TOPIC')
 
 if None in [API_URL, API_URL_DOCKER, BACKEND_TYPE, BACKEND_CONNECTION,
-            CENTRE_ID, GB, GB_TOPIC]:
+            CENTRE_ID, GB]:
     raise EnvironmentError('Environment variables not set!')
diff --git a/wis2-grep.env b/wis2-grep.env
@@ -6,4 +6,3 @@ export WIS2_GREP_BACKEND_CONNECTION=http://wis2-grep-backend:9200/wis2-notificat
 export WIS2_GREP_CENTRE_ID=ca-eccc-msc-global-replay
 #export WIS2_GREP_GB=mqtts://everyone:[email protected]:8883
 export WIS2_GREP_GB=mqtts://everyone:[email protected]:8883
-export WIS2_GREP_GB_TOPIC=origin/a/wis2/#