Merge pull request #2310 from fluent/fix-udp-error-handling

Add more errors to ignore list in UDP socket
fluent · Feb 25, 2019 · 0db9e43 · 0db9e43
2 parents 2b8bd40 + c780e53
commit 0db9e43
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/fluent/plugin_helper/server.rb b/lib/fluent/plugin_helper/server.rb
@@ -523,7 +523,7 @@ def initialize(sock, max_bytes, flags, close_socket, log, under_plugin_developme
           def on_readable_without_sock
             begin
               data = @sock.recv(@max_bytes, @flags)
-            rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINTR, Errno::ECONNRESET
+            rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINTR, Errno::ECONNRESET, IOError, Errno::EBADF
               return
             end
             @callback.call(data)
@@ -536,7 +536,7 @@ def on_readable_without_sock
           def on_readable_with_sock
             begin
               data, addr = @sock.recvfrom(@max_bytes)
-            rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINTR, Errno::ECONNRESET
+            rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINTR, Errno::ECONNRESET, IOError, Errno::EBADF
               return
             end
             @callback.call(data, UDPCallbackSocket.new(@sock, addr, close_socket: @close_socket))