Merge pull request RedHatInsights#1170 from astrozzc/catch_error

Catch error if already subscribed
petracihalova · Aug 15, 2024 · c85ecb1 · c85ecb1
2 parents 28f982e + d24f354
commit c85ecb1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rbac/management/principal/cleaner.py b/rbac/management/principal/cleaner.py
@@ -161,12 +161,12 @@ def clean_principals_via_umb():
     logger.info("clean_tenant_principals: Start principal clean up via umb.")
     try:
         UMB_CLIENT.connect()
+        UMB_CLIENT.subscribe(QUEUE, {StompSpec.ACK_HEADER: StompSpec.ACK_CLIENT_INDIVIDUAL})
     except StompConnectionError as e:
-        # Skip if already connected
-        if not str(e).startswith("Already connected"):
+        # Skip if already connected/subscribed
+        if not str(e).startswith(("Already connected", "Already subscribed")):
             raise e
 
-    UMB_CLIENT.subscribe(QUEUE, {StompSpec.ACK_HEADER: StompSpec.ACK_CLIENT_INDIVIDUAL})
     while UMB_CLIENT.canRead(2):  # Check if queue is empty, two sec timeout
         frame = UMB_CLIENT.receiveFrame()
         data_dict = xmltodict.parse(frame.body)