diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-25 00:26:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-25 00:26:48 +0000 |
| commit | 4a9bfe72fd98407c7dfff33b3868e1fc9854b18f (patch) | |
| tree | fc2ec7f5f4d07aa8510dd815237e53eeefb8e384 | |
| parent | 77c3604b406af36b2ca9efaa0a95a17e0239389d (diff) | |
| parent | db99154bd47d9110e26c5ea4d9942b7e3bb4f832 (diff) | |
| download | oslo-messaging-4a9bfe72fd98407c7dfff33b3868e1fc9854b18f.tar.gz | |
Merge "fix up verb tense in log message" into stable/kilo
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/tests/drivers/test_impl_rabbit.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index d10ac22..1d93f2f 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -934,7 +934,7 @@ class Connection(object): pass except recoverable_errors as exc: LOG.info(_LI("A recoverable connection/channel error " - "occurs, try to reconnect: %s"), exc) + "occurred, trying to reconnect: %s"), exc) except Exception: LOG.exception(_LE("Unexpected error during heartbeart " "thread processing, retrying...")) diff --git a/oslo_messaging/tests/drivers/test_impl_rabbit.py b/oslo_messaging/tests/drivers/test_impl_rabbit.py index b4e691d..5b68ea9 100644 --- a/oslo_messaging/tests/drivers/test_impl_rabbit.py +++ b/oslo_messaging/tests/drivers/test_impl_rabbit.py @@ -98,8 +98,8 @@ class TestHeartbeat(test_utils.BaseTestCase): def test_test_heartbeat_sent_connection_fail(self): self._do_test_heartbeat_sent( heartbeat_side_effect=kombu.exceptions.ConnectionError, - info='A recoverable connection/channel error occurs, ' - 'try to reconnect: %s') + info='A recoverable connection/channel error occurred, ' + 'trying to reconnect: %s') class TestRabbitDriverLoad(test_utils.BaseTestCase): |