openstack
/
oslo.messaging
Code Issues Proposed changes

Fix spelling typo in output 

abandonning -> abandoning
for output of oslo_messaging/_drivers/impl_rabbit.py

Plus some small fix for source comments/config help.

Change-Id: Ia4bd1465cbe8beef8e109d20e5ddbec12d6d8e8f
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
This commit is contained in:
Zhao Lei 2015-09-24 17:31:53 +08:00
parent 6f95227e33
commit 9138ba24b8
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/routing_notifier.yaml.sample
View File

@ -3,7 +3,7 @@
# However, defining different sets for the same driver allows you # However, defining different sets for the same driver allows you
# to do OR operations. # to do OR operations.
# #
# See how this logic is modeled below: # See how this logic is modelled below:
# #
# if (priority in info, warn or error) or # if (priority in info, warn or error) or
# (event == compute.scheduler.run_instance) # (event == compute.scheduler.run_instance)

8
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -479,7 +479,7 @@ class Connection(object):
# seconds, but we use a lock around the kombu connection # seconds, but we use a lock around the kombu connection
# so, to not lock to much this lock to most of the time do nothing # so, to not lock to much this lock to most of the time do nothing
# expected waiting the events drain, we start heartbeat_check and # expected waiting the events drain, we start heartbeat_check and
# retreive the server heartbeat packet only two times more than # retrieve the server heartbeat packet only two times more than
# the minimum required for the heartbeat works # the minimum required for the heartbeat works
# (heatbeat_timeout/heartbeat_rate/2.0, default kombu # (heatbeat_timeout/heartbeat_rate/2.0, default kombu
# heartbeat_rate is 2) # heartbeat_rate is 2)
@ -501,7 +501,7 @@ class Connection(object):
LOG.info(_LI('Connected to AMQP server on %(hostname)s:%(port)s'), LOG.info(_LI('Connected to AMQP server on %(hostname)s:%(port)s'),
self.connection.info()) self.connection.info())
# NOTE(sileht): value choosen according the best practice from kombu # NOTE(sileht): value chosen according the best practice from kombu
# http://kombu.readthedocs.org/en/latest/reference/kombu.common.html#kombu.common.eventloop # 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 heatbeat, we can set a bigger timeout, and check we receive the
# heartbeat packets regulary # heartbeat packets regulary
@ -864,7 +864,7 @@ class Connection(object):
exc) exc)
def _consume(): def _consume():
# NOTE(sileht): in case the acknowledgement or requeue of a # NOTE(sileht): in case the acknowledgment or requeue of a
# message fail, the kombu transport can be disconnected # message fail, the kombu transport can be disconnected
# In this case, we must redeclare our consumers, so raise # In this case, we must redeclare our consumers, so raise
# a recoverable error to trigger the reconnection code. # a recoverable error to trigger the reconnection code.
@ -1085,7 +1085,7 @@ class Connection(object):
elif exc.code == 404: elif exc.code == 404:
msg = _("The exchange %(exchange)s to send to " msg = _("The exchange %(exchange)s to send to "
"%(routing_key)s still doesn't exist after " "%(routing_key)s still doesn't exist after "
"%(duration)s sec abandonning...") % { "%(duration)s sec abandoning...") % {
'duration': duration, 'duration': duration,
'exchange': exchange.name, 'exchange': exchange.name,
'routing_key': routing_key} 'routing_key': routing_key}

2
oslo_messaging/_drivers/impl_zmq.py
View File

@ -127,7 +127,7 @@ class ZmqDriver(base.BaseDriver):
allowed_remote_exmods=None): allowed_remote_exmods=None):
"""Construct ZeroMQ driver. """Construct ZeroMQ driver.
Intialize driver options. Initialize driver options.
Construct matchmaker - pluggable interface to targets management Construct matchmaker - pluggable interface to targets management
Name Service Name Service

2
oslo_messaging/_utils.py
View File

@ -87,7 +87,7 @@ class DispatcherExecutorContext(object):
def done(self): def done(self):
"""Callback after the incoming message have been dispathed """Callback after the incoming message have been dispathed
Should be runned in the main executor thread/greenlet/corotine Should be ran in the main executor thread/greenlet/corotine
""" """
# FIXME(sileht): this is not currently true, this works only because # FIXME(sileht): this is not currently true, this works only because
# the driver connection used for polling write on the wire only to # the driver connection used for polling write on the wire only to

4
oslo_messaging/tests/drivers/test_impl_rabbit.py
View File

@ -222,7 +222,7 @@ class TestRabbitPublisher(test_utils.BaseTestCase):
try_send(e_passive) try_send(e_passive)
with mock.patch('kombu.messaging.Producer', side_effect=exc): with mock.patch('kombu.messaging.Producer', side_effect=exc):
# Shoud reset the cache and ensures the exchange does # Should reset the cache and ensures the exchange does
# not exists # not exists
self.assertRaises(exc, try_send, e_passive) self.assertRaises(exc, try_send, e_passive)
# Recreate it # Recreate it
@ -473,7 +473,7 @@ class TestSendReceive(test_utils.BaseTestCase):
if self.reply_failure_404: if self.reply_failure_404:
# NOTE(sileht) all reply fail, first take # NOTE(sileht) all reply fail, first take
# kombu_reconnect_timeout seconds to fail # kombu_reconnect_timeout seconds to fail
# next immediatly fail # next immediately fail
dt = time.time() - start dt = time.time() - start
timeout = self.conf.oslo_messaging_rabbit.kombu_reconnect_timeout timeout = self.conf.oslo_messaging_rabbit.kombu_reconnect_timeout
self.assertTrue(timeout <= dt < (timeout + 0.100), dt) self.assertTrue(timeout <= dt < (timeout + 0.100), dt)

2
oslo_messaging/tests/rpc/test_server.py
View File

@ -123,7 +123,7 @@ class TestRPCServer(test_utils.BaseTestCase, ServerSetupMixin):
# Mocking executor # Mocking executor
server._executor = mock.Mock() server._executor = mock.Mock()
# Here assigning executor's listener object to listener variable # Here assigning executor's listener object to listener variable
# before calling wait method, beacuse in wait method we are # before calling wait method, because in wait method we are
# setting executor to None. # setting executor to None.
listener = server._executor.listener listener = server._executor.listener
# call server wait method # call server wait method