Merge "Touch up grammar in warning messages"

This commit is contained in:
Jenkins 2014-12-05 09:58:33 +00:00 committed by Gerrit Code Review
commit a7f3ecb360
3 changed files with 8 additions and 8 deletions

View File

@ -16,15 +16,15 @@ Transport
.. autofunction:: set_transport_defaults
About fork oslo.messaging transport object
------------------------------------------
Forking Processes and oslo.messaging Transport objects
------------------------------------------------------
oslo.messaging can't ensure that forking a process that shares the same
transport object is safe for the library consumer, because it relies on
different 3rd party libraries that don't ensure that too, but in certain
case/driver it works:
different 3rd party libraries that don't ensure that. In certain
cases, with some drivers, it does work:
* rabbit: works only if no connection have already been established.
* qpid: doesn't work (qpid library have a global state that use fd
that can't be resetted)
* qpid: doesn't work (The qpid library has a global state that uses
file descriptors that can't be reset)
* amqp1: works

View File

@ -590,7 +590,7 @@ class Connection(object):
# https://github.com/celery/kombu/blob/master/kombu/transport/
# qpid_patches.py#L67
LOG.warn("Process forked! "
"This can results to unpredictable behavior. "
"This can result in unpredictable behavior. "
"See: http://docs.openstack.org/developer/"
"oslo.messaging/transport.html")
self._initial_pid = current_pid

View File

@ -579,7 +579,7 @@ class Connection(object):
current_pid = os.getpid()
if self._initial_pid != current_pid:
LOG.warn("Process forked after connection established! "
"This can results to unpredictable behavior. "
"This can result in unpredictable behavior. "
"See: http://docs.openstack.org/developer/"
"oslo.messaging/transport.html")
self._initial_pid = current_pid