openstack/oslo.messaging
Code Issues Proposed changes

Merge "fix typos"

Browse Source
This commit is contained in:
Zuul 2019-06-18 17:59:06 +00:00 committed by Gerrit Code Review
commit b8c3a1ea59
2 changed files with 4 additions and 4 deletions
oslo_messaging/_drivers
common.pyimpl_rabbit.py

2
oslo_messaging/_drivers/common.py

@ -377,7 +377,7 @@ class DecayingTimer(object):
# greenthread.
# So, a connection cannot be shared between thread/greenthread and
# this two variables permit to define the purpose of the connection
# to allow drivers to add special handling if needed (like heatbeat).
# to allow drivers to add special handling if needed (like heartbeat).
# amqp drivers create 3 kind of connections:
# * driver.listen*(): each call create a new 'PURPOSE_LISTEN' connection
# * driver.send*(): a pool of 'PURPOSE_SEND' connections is used

6
oslo_messaging/_drivers/impl_rabbit.py

@ -535,7 +535,7 @@ class Connection(object):
# expected waiting the events drain, we start heartbeat_check and
# retrieve the server heartbeat packet only two times more than
# the minimum required for the heartbeat works
# (heatbeat_timeout/heartbeat_rate/2.0, default kombu
# (heartbeat_timeout/heartbeat_rate/2.0, default kombu
# heartbeat_rate is 2)
self._heartbeat_wait_timeout = (
float(self.heartbeat_timeout_threshold) /
@ -560,7 +560,7 @@ class Connection(object):
# NOTE(sileht): value chosen according the best practice from kombu
# http://kombu.readthedocs.org/en/latest/reference/kombu.common.html#kombu.common.eventloop
# For heatbeat, we can set a bigger timeout, and check we receive the
# For heartbeat, we can set a bigger timeout, and check we receive the
# heartbeat packets regulary
if self._heartbeat_supported_and_enabled():
self._poll_timeout = self._heartbeat_wait_timeout
@ -953,7 +953,7 @@ class Connection(object):
"occurred, trying to reconnect: %s", exc)
self.ensure_connection()
except Exception:
LOG.warning("Unexpected error during heartbeart "
LOG.warning("Unexpected error during heartbeat "
"thread processing, retrying...")
LOG.debug('Exception', exc_info=True)