diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-09 13:55:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-09 13:55:37 +0000 |
| commit | 0f24108058fbf15752d384be4c13e4fbac801f2a (patch) | |
| tree | 1fe5324840fe4fcf3b9311b42b74b612def92f9c | |
| parent | 33152a1f98020400cfe5e9fb4a11cccc7a358235 (diff) | |
| parent | b5e1583e9358bc765c5978b30d4bccf225f50842 (diff) | |
| download | oslo-messaging-1.8.3.tar.gz | |
Merge "Adding Publisher Acknowledgements/confirms" into stable/kilo1.8.3
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 3 | ||||
| -rw-r--r-- | oslo_messaging/tests/drivers/test_impl_rabbit.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 6cbf462..a776207 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -672,7 +672,8 @@ class Connection(object): self._url, ssl=self._fetch_ssl_params(), login_method=self._login_method, failover_strategy="shuffle", - heartbeat=self.driver_conf.heartbeat_timeout_threshold) + heartbeat=self.driver_conf.heartbeat_timeout_threshold, + transport_options={'confirm_publish': True}) LOG.info(_LI('Connecting to AMQP server on %(hostname)s:%(port)d'), self.connection.info()) diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index eab73ab..a7e2a0e 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -169,7 +169,8 @@ class TestRabbitDriverLoadSSL(test_utils.BaseTestCase): transport._driver._get_connection() connection_klass.assert_called_once_with( - 'memory:///', ssl=self.expected, login_method='AMQPLAIN', + 'memory:///', transport_options={'confirm_publish': True}, + ssl=self.expected, login_method='AMQPLAIN', heartbeat=0, failover_strategy="shuffle") |