Handle #eagerly_finish's errors properly

puma · Jul 24, 2012 · 9844daa · 9844daa
1 parent 6cb5479
commit 9844daa
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/lib/puma/server.rb b/lib/puma/server.rb
@@ -199,14 +199,25 @@ def run(background=true)
       @status = :run
 
       @thread_pool = ThreadPool.new(@min_threads, @max_threads) do |client|
-        if client.eagerly_finish
-          process_client client
+
+        process_now = false
+
+        begin
+          process_now = client.eagerly_finish
+        rescue HttpParserError => e
+          @events.parse_error self, client.env, e
+        rescue EOFError
+          client.close
         else
-          @reactor.add client
+          if process_now
+            process_client client
+          else
+            @reactor.add client
+          end
         end
       end
 
-      @reactor = Reactor.new @events, @thread_pool
+      @reactor = Reactor.new self, @thread_pool
 
       @reactor.run_in_thread