summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-28 16:25:33 +0000
committerGerrit Code Review <review@openstack.org>2020-07-28 16:25:33 +0000
commit7ef75b44e9e3f0d627304f4d8807dad2ae503ddd (patch)
tree7647d31d8c3ba77a0126a804984d1964a7bee8b8
parenta5ae9f4aa0e18787b4bb676b3e725c225deae96d (diff)
parent26e8bb4cc9097fddf3c2e34599b131e3f5d73867 (diff)
downloadoslo-messaging-7ef75b44e9e3f0d627304f4d8807dad2ae503ddd.tar.gz
Merge "Catch ConnectionForced Exception"
-rw-r--r--oslo_messaging/_drivers/impl_rabbit.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index f6ddf8f..8ef04e7 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -27,6 +27,7 @@ import time
from urllib import parse
import uuid
+from amqp import exceptions as amqp_exec
import kombu
import kombu.connection
import kombu.entity
@@ -1003,7 +1004,8 @@ class Connection(object):
except (socket.timeout,
ConnectionRefusedError,
OSError,
- kombu.exceptions.OperationalError) as exc:
+ kombu.exceptions.OperationalError,
+ amqp_exec.ConnectionForced) as exc:
LOG.info("A recoverable connection/channel error "
"occurred, trying to reconnect: %s", exc)
self.ensure_connection()