summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-02 21:57:30 +0000
committerGerrit Code Review <review@openstack.org>2019-10-02 21:57:30 +0000
commit86976f4a45b45a6cdfa16454c011518dd85cbd7a (patch)
tree2dec9b8c9dde5ed93abe226cee6a8307e2e2344f
parente8c67609897888e0eff8f0e3ed5a374d604ca710 (diff)
parent4863195286f3cfe49086960e61042939f3ed52b4 (diff)
downloadoslo-messaging-5.35.6.tar.gz
Merge "fix typos" into stable/queensqueens-em5.35.6
-rw-r--r--oslo_messaging/_drivers/common.py2
-rw-r--r--oslo_messaging/_drivers/impl_rabbit.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/oslo_messaging/_drivers/common.py b/oslo_messaging/_drivers/common.py
index 9b35c5d..644f795 100644
--- a/oslo_messaging/_drivers/common.py
+++ b/oslo_messaging/_drivers/common.py
@@ -368,7 +368,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
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 1520e1a..abcc8a5 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -623,7 +623,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) /
@@ -648,7 +648,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
@@ -1027,8 +1027,8 @@ class Connection(object):
"occurred, trying to reconnect: %s"), exc)
self.ensure_connection()
except Exception:
- LOG.warning(_LW("Unexpected error during heartbeart "
- "thread processing, retrying..."))
+ LOG.warning(_LW("Unexpected error during heartbeat "
+ "thread processing, retrying..."))
LOG.debug('Exception', exc_info=True)
self._heartbeat_exit_event.wait(