summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavanum Srinivas <davanum@gmail.com>2015-12-11 11:04:13 +0300
committerDavanum Srinivas <davanum@gmail.com>2015-12-11 11:04:13 +0300
commit46daf858144202a072c4bf8580aeafec11d20e13 (patch)
tree46d9e4046f11a6b84526e24cb7377bfe00d208d6
parent0a0e6d0d50ac2a1f937ba45da2d54bec01b8c4ab (diff)
downloadoslo-messaging-46daf858144202a072c4bf8580aeafec11d20e13.tar.gz
Cleanup parameter docstrings
Change-Id: I301fdd51446bf0c0a6dd0d05b26da0556db8367d
-rw-r--r--oslo_messaging/_drivers/common.py2
-rw-r--r--oslo_messaging/server.py24
2 files changed, 1 insertions, 25 deletions
diff --git a/oslo_messaging/_drivers/common.py b/oslo_messaging/_drivers/common.py
index 02c0480..85d814d 100644
--- a/oslo_messaging/_drivers/common.py
+++ b/oslo_messaging/_drivers/common.py
@@ -109,7 +109,7 @@ class Timeout(RPCException):
:param info: Extra info to convey to the user
:param topic: The topic that the rpc call was sent to
- :param rpc_method_name: The name of the rpc method being
+ :param method: The name of the rpc method being
called
"""
self.info = info
diff --git a/oslo_messaging/server.py b/oslo_messaging/server.py
index 804bcf1..6b4e50a 100644
--- a/oslo_messaging/server.py
+++ b/oslo_messaging/server.py
@@ -342,14 +342,6 @@ class MessageHandlingServer(service.ServiceBase, _OrderedTaskRunner):
registering a callback with an event loop. Similarly, the executor may
choose to dispatch messages in a new thread, coroutine or simply the
current thread.
-
- :param log_after: Emit a log message if waiting longer than `log_after`
- seconds to run this task. If set to zero, no log
- message will be emitted. Defaults to 30 seconds.
- :type log_after: int
- :param timeout: Raise `TaskTimeout` if the task has to wait longer than
- `timeout` seconds before executing.
- :type timeout: int
"""
# Warn that restarting will be deprecated
if self._started:
@@ -382,14 +374,6 @@ class MessageHandlingServer(service.ServiceBase, _OrderedTaskRunner):
the server. However, the server may still be in the process of handling
some messages, and underlying driver resources associated to this
server are still in use. See 'wait' for more details.
-
- :param log_after: Emit a log message if waiting longer than `log_after`
- seconds to run this task. If set to zero, no log
- message will be emitted. Defaults to 30 seconds.
- :type log_after: int
- :param timeout: Raise `TaskTimeout` if the task has to wait longer than
- `timeout` seconds before executing.
- :type timeout: int
"""
self._executor_obj.stop()
@@ -403,14 +387,6 @@ class MessageHandlingServer(service.ServiceBase, _OrderedTaskRunner):
Once it's finished, the underlying driver resources associated to this
server are released (like closing useless network connections).
-
- :param log_after: Emit a log message if waiting longer than `log_after`
- seconds to run this task. If set to zero, no log
- message will be emitted. Defaults to 30 seconds.
- :type log_after: int
- :param timeout: Raise `TaskTimeout` if the task has to wait longer than
- `timeout` seconds before executing.
- :type timeout: int
"""
try:
self._executor_obj.wait()