aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-11-22 11:15:53 +0100
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-11-22 11:15:53 +0100
commit8613e474cbd8a56672ce182863a4b8d106b19cde (patch)
treeb40240b180bdf0ad1d18de56c2340ec7cbdfc1f8 /src/python
parent1864870ef0378273c9464a7fcca26b23b8da1e92 (diff)
parent8a4ac886e4da6b278f30115431f090661bd1576b (diff)
Merge remote-tracking branch 'upstream/v1.0.x' into HEAD
Diffstat (limited to 'src/python')
-rw-r--r--src/python/grpcio/grpc/__init__.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py
index 526bd9e14f..4e4062bafc 100644
--- a/src/python/grpcio/grpc/__init__.py
+++ b/src/python/grpcio/grpc/__init__.py
@@ -927,10 +927,16 @@ class Server(six.with_metaclass(abc.ABCMeta)):
passed in a previous call will not have the effect of stopping the server
later.
+ This method does not block for any significant length of time. If None is
+ passed as the grace value, existing RPCs are immediately aborted and this
+ method blocks until this Server is completely stopped.
+
Args:
- grace: A duration of time in seconds to allow existing RPCs to complete
- before being aborted by this Server's stopping. If None, this method
- will block until the server is completely stopped.
+ grace: A duration of time in seconds or None. If a duration of time in
+ seconds, the time to allow existing RPCs to complete before being
+ aborted by this Server's stopping. If None, all RPCs will be aborted
+ immediately and this method will block until this Server is completely
+ stopped.
Returns:
A threading.Event that will be set when this Server has completely