diff options
| author |  apolcyn <apolcyn@google.com> | 2018-09-18 10:33:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-18 10:33:29 -0700 |
| commit | 8ad90b42a7447e0a90778c462e40fc6116401682 (patch) | |
| tree | b044b9ba353fc050b25d0d750c35d93f9b14ed99 /src/ruby | |
| parent | acff0768adf6e7da5971f84112a1ef1d732177ca (diff) | |
| parent | 005cb34614a9084a0230bfe62daa2e83b735b595 (diff) | |
Merge pull request #16477 from ganmacs/rescue-grpc-call-error
Rescue `GRPC::Core::CallError` so that worker threads are not killed
Diffstat (limited to 'src/ruby')
| -rw-r--r-- | src/ruby/lib/grpc/generic/rpc_server.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ruby/lib/grpc/generic/rpc_server.rb b/src/ruby/lib/grpc/generic/rpc_server.rb index 838ac45927..3b5a0ce27f 100644 --- 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 |