From a012edf10f8d5404207a03338198b6e7f413e29b Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 10 Nov 2020 14:33:14 -0800 Subject: [PATCH 1/2] Stop the ctrl-c spam --- src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index a630ed88117..466c3e21ef1 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -780,7 +780,6 @@ cdef CallbackFailureHandler SERVER_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHan None, InternalError) - cdef class AioServer: def __init__(self, loop, thread_pool, generic_handlers, interceptors, @@ -884,6 +883,8 @@ cdef class AioServer: def _serving_task_crash_handler(self, object task): """Shutdown the server immediately if unexpectedly exited.""" + if task.cancelled(): + return if task.exception() is None: return if self._status != AIO_SERVER_STATUS_STOPPING: From c0e0207fde6ddf1011ae639e8b1a5315664b4fd5 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Tue, 10 Nov 2020 14:37:43 -0800 Subject: [PATCH 2/2] Add the empty line back --- src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi | 1 + 1 file changed, 1 insertion(+) diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi index 466c3e21ef1..8c74d3ee22b 100644 --- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi +++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/server.pyx.pxi @@ -780,6 +780,7 @@ cdef CallbackFailureHandler SERVER_SHUTDOWN_FAILURE_HANDLER = CallbackFailureHan None, InternalError) + cdef class AioServer: def __init__(self, loop, thread_pool, generic_handlers, interceptors,