From 68025b8f9a6b7e7ffb1976920208185a8377448b Mon Sep 17 00:00:00 2001 From: Peter Portante Date: Fri, 1 Nov 2013 14:57:28 -0400 Subject: [PATCH] Fix up sphinx docs for *make_request* methods Change-Id: I05ac17ba45eda99dc9fb9d6ecf2374d1e8371a32 Signed-off-by: Peter Portante --- swift/proxy/controllers/base.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/swift/proxy/controllers/base.py b/swift/proxy/controllers/base.py index afe2eac4ac..ef78b75ae2 100644 --- a/swift/proxy/controllers/base.py +++ b/swift/proxy/controllers/base.py @@ -778,9 +778,10 @@ class Controller(object): def _make_request(self, nodes, part, method, path, headers, query, logger_thread_locals): """ - Sends an HTTP request to a single node and aggregates the result. - It attempts the primary node, then iterates over the handoff nodes - as needed. + Iterates over the given node iterator, sending an HTTP request to one + node at a time. The first non-informational, non-server-error + response is returned. If no non-informational, non-server-error + response is received from any of the nodes, returns None. :param nodes: an iterator of the backend server and handoff servers :param part: the partition number @@ -792,7 +793,7 @@ class Controller(object): :param logger_thread_locals: The thread local values to be set on the self.app.logger to retain transaction logging information. - :returns: a swob.Response object + :returns: a swob.Response object, or None if no responses were received """ self.app.logger.thread_locals = logger_thread_locals for node in nodes: