Merge pull request #16477 from ganmacs/rescue-grpc-call-error

Rescue `GRPC::Core::CallError` so that worker threads are not killed
6 years ago · 8ad90b42a7
parent acff0768ad 005cb34614
commit 8ad90b42a7
1 changed files with 1 additions and 1 deletions
--- a/src/ruby/lib/grpc/generic/rpc_server.rb
+++ b/src/ruby/lib/grpc/generic/rpc_server.rb
@ -136,7 +136,7 @@ module GRPC
        begin
          blk, args = worker_queue.pop
          blk.call(*args)
-        rescue StandardError => e
+        rescue StandardError, GRPC::Core::CallError => e
          GRPC.logger.warn('Error in worker thread')
          GRPC.logger.warn(e)
        end