diff options
author | Zuul <zuul@review.opendev.org> | 2019-06-18 17:59:06 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-06-18 17:59:06 +0000 |
commit | b8c3a1ea592e1c0a41e331991959ea00e1f87945 (patch) | |
tree | 45a851d046e7af6e89d5384fb11e65d97ab39dec | |
parent | 03ec779cdfea76e5d23f997d1679e01ddaad9309 (diff) | |
parent | 54356899da5d4a0997abb6819f184a27929cc0e9 (diff) | |
download | oslo-messaging-b8c3a1ea592e1c0a41e331991959ea00e1f87945.tar.gz |
Merge "fix typos"
-rw-r--r-- | oslo_messaging/_drivers/common.py | 2 | ||||
-rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oslo_messaging/_drivers/common.py b/oslo_messaging/_drivers/common.py index 90f32e3..64351b2 100644 --- a/oslo_messaging/_drivers/common.py +++ b/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 diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index aedb163..02c3dbe 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/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) |