diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-17 12:30:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-17 12:30:33 +0000 |
| commit | e4e6444f4260c62737edad96c1a25cee73a25611 (patch) | |
| tree | 28c8143b61674849ddd3e942c40869a55140949d | |
| parent | b63ab206c028af0f16800401e99f80ccc9d573b6 (diff) | |
| parent | 6ad4e5c39ef95a2e0bcf3e11938c1793b55957f6 (diff) | |
| download | oslo-messaging-e4e6444f4260c62737edad96c1a25cee73a25611.tar.gz | |
Merge "rabbit: on reconnect set socket timeout after channel is set" into stable/mitaka
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 60461d7..9fb2b7e 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -745,9 +745,8 @@ class Connection(object): """Callback invoked when the kombu reconnects and creates a new channel, we use it the reconfigure our consumers. """ - - self.set_transport_socket_timeout() self._set_current_channel(new_channel) + self.set_transport_socket_timeout() LOG.info(_LI('Reconnected to AMQP server on ' '%(hostname)s:%(port)s via [%(transport)s] client'), |