retry_delay is inside pika, adding another one outside

EGA-archive · Nov 7, 2018 · cc8df7c · cc8df7c
1 parent 12ccca8
commit cc8df7c
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lega/utils/amqp.py b/lega/utils/amqp.py
@@ -9,6 +9,7 @@
 import uuid
 from contextlib import contextmanager
 import socket
+from time import sleep
 
 from ..conf import CONF
 
@@ -81,9 +82,10 @@ def connect(self, blocking=True, force=False):
 
         connector = pika.BlockingConnection if blocking else pika.SelectConnection
 
-        retry = CONF.get_value('broker', 'retry', conv=int, default=1)
+        retry = CONF.get_value(self.conf_section, 'retry', conv=int, default=1)
+        retry_delay = CONF.get_value(self.conf_section,'retry_delay', conv=int, default=10) # seconds
         assert retry > 0, "The number of reconnection should be >= 1"
-        LOG.debug("%d attempts", retry)
+        LOG.debug("%d attempts [interval: %d]", retry, retry_delay)
         count = 0
         while count < retry:
             count += 1
@@ -95,13 +97,14 @@ def connect(self, blocking=True, force=False):
                 return
             except (pika.exceptions.ProbableAccessDeniedError,
                     pika.exceptions.ProbableAuthenticationError,
-                    pika.exceptions.ConnectionClosed) as e:
+                    pika.exceptions.ConnectionClosed,
+                    socket.gaierror) as e:
                 LOG.debug("MQ connection error: %r", e)
-            except socket.gaierror as e:
-                LOG.debug("%s", e)
-            # except Exception as e:
-            #     LOG.debug("Invalid connection: %r", e)
-            #     break
+                LOG.debug("Delay %d seconds", retry_delay)
+                sleep(retry_delay)
+            except Exception as e:
+                LOG.debug("Invalid connection: %r", e)
+                break
 
         # fail to connect
         if self.on_failure: