From 66db2b310db575565ec03545d3fd65b59418580c Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 4 Dec 2014 16:04:37 -0500
Subject: [PATCH] Touch up grammar in warning messages
Change-Id: I556e6e646417be3732a7c31987ec964f9808f079
---
doc/source/transport.rst | 12 ++++++------
oslo/messaging/_drivers/impl_qpid.py | 2 +-
oslo/messaging/_drivers/impl_rabbit.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/source/transport.rst b/doc/source/transport.rst
index fc6a7cfb1..b3076c69c 100644
--- a/doc/source/transport.rst
+++ b/doc/source/transport.rst
@@ -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
diff --git a/oslo/messaging/_drivers/impl_qpid.py b/oslo/messaging/_drivers/impl_qpid.py
index 25083c35c..3895c8aa6 100644
--- a/oslo/messaging/_drivers/impl_qpid.py
+++ b/oslo/messaging/_drivers/impl_qpid.py
@@ -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
diff --git a/oslo/messaging/_drivers/impl_rabbit.py b/oslo/messaging/_drivers/impl_rabbit.py
index 2fda9b40c..e9a695248 100644
--- a/oslo/messaging/_drivers/impl_rabbit.py
+++ b/oslo/messaging/_drivers/impl_rabbit.py
@@ -559,7 +559,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