Fix some ancient and incorrect error handling code

puma · Aug 4, 2015 · 2562379 · 2562379
1 parent 6bffcf7
commit 2562379
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/puma/server.rb b/lib/puma/server.rb
@@ -189,12 +189,13 @@ def handle_servers_lopez_mode
                     pool << client
                   end
                 rescue SystemCallError
+                  # nothing
+                rescue Errno::ECONNABORTED
+                  # client closed the socket even before accept
+                  io.close rescue nil
                 end
               end
             end
-          rescue Errno::ECONNABORTED
-            # client closed the socket even before accept
-            client.close rescue nil
           rescue Object => e
             @events.unknown_error self, e, "Listen loop"
           end
@@ -320,12 +321,13 @@ def handle_servers
                     pool.wait_until_not_full unless queue_requests
                   end
                 rescue SystemCallError
+                  # nothing
+                rescue Errno::ECONNABORTED
+                  # client closed the socket even before accept
+                  io.close rescue nil
                 end
               end
             end
-          rescue Errno::ECONNABORTED
-            # client closed the socket even before accept
-            client.close rescue nil
           rescue Object => e
             @events.unknown_error self, e, "Listen loop"
           end