diff options
Diffstat (limited to 'kombu')
| -rw-r--r-- | kombu/connection.py | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/kombu/connection.py b/kombu/connection.py index 50dbe10d..0c9779b5 100644 --- a/kombu/connection.py +++ b/kombu/connection.py @@ -482,7 +482,7 @@ class Connection: def ensure(self, obj, fun, errback=None, max_retries=None, interval_start=1, interval_step=1, interval_max=1, - on_revive=None): + on_revive=None, retry_errors=None): """Ensure operation completes. Regardless of any channel/connection errors occurring. @@ -511,6 +511,9 @@ class Connection: each retry. on_revive (Callable): Optional callback called whenever revival completes successfully + retry_errors (tuple): Optional list of errors to retry on + regardless of the connection state. Must provide max_retries + if this is specified. Examples: >>> from kombu import Connection, Producer @@ -525,6 +528,15 @@ class Connection: ... errback=errback, max_retries=3) >>> publish({'hello': 'world'}, routing_key='dest') """ + if retry_errors is None: + retry_errors = tuple() + elif max_retries is None: + # If the retry_errors is specified, but max_retries is not, + # this could lead into an infinite loop potentially. + raise ValueError( + "max_retries must be specified if retry_errors is specified" + ) + def _ensured(*args, **kwargs): got_connection = 0 conn_errors = self.recoverable_connection_errors @@ -536,6 +548,11 @@ class Connection: for retries in count(0): # for infinity try: return fun(*args, **kwargs) + except retry_errors as exc: + if max_retries is not None and retries >= max_retries: + raise + self._debug('ensure retry policy error: %r', + exc, exc_info=1) except conn_errors as exc: if got_connection and not has_modern_errors: # transport can not distinguish between |