puma 1.6.1-java → 1.6.2-java

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.6.2 / 2012-08-27
+
+* 1 bug fix:
+  * Rescue StandardError instead of IOError to handle SystemCallErrors
+    as well as other application exceptions inside the reactor.
+
 === 1.6.1 / 2012-07-23
 
 * 1 packaging bug fixed:

data/README.md

@@ -122,6 +122,10 @@ If you start puma with `-S some/path` then you can pass that same path to the `p
 
 will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the control/status app described above.
 
+## Managing multiple Pumas / init.d script 
+
+If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for an init.d script.
+
 ## License
 
 Puma is copyright 2011 Evan Phoenix and contributors. It is licensed under the BSD license. See the include LICENSE file for details.

data/lib/puma/const.rb

@@ -25,7 +25,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "1.6.1".freeze
+    PUMA_VERSION = VERSION = "1.6.2".freeze
 
     # The default number of seconds for another request within a persistent
     # session.

data/lib/puma/reactor.rb

@@ -12,10 +12,12 @@ module Puma
       @input = []
       @sleep_for = DefaultSleepFor
       @timeouts = []
+
+      @sockets = [@ready]
     end
 
     def run
-      sockets = [@ready]
+      sockets = @sockets
 
       while true
         ready = IO.select sockets, nil, nil, @sleep_for
@@ -53,7 +55,7 @@ module Puma
 
                 @events.parse_error @server, c.env, e
 
-              rescue IOError => e
+              rescue StandardError => e
                 c.close
                 sockets.delete c
               end
@@ -79,12 +81,14 @@ module Puma
 
     def run_in_thread
       @thread = Thread.new {
-        begin
-          run
-        rescue Exception => e
-          puts "MAJOR ERROR DETECTED"
-          p e
-          puts e.backtrace
+        while true
+          begin
+            run
+            break
+          rescue StandardError => e
+            STDERR.puts "Error in reactor loop escaped: #{e.message} (#{e.class})"
+            puts e.backtrace
+          end
         end
       }
     end

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-08-12"
+  s.date = "2012-08-27"
   s.description = "Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications. It can be used with any application that supports Rack, and is considered the replacement for Webrick and Mongrel. It was designed to be the go-to server for [Rubinius](http://rubini.us), but also works well with JRuby and MRI. Puma is intended for use in both development and production environments.\n\nUnder the hood, Puma processes requests using a C-optimized Ragel extension (inherited from Mongrel) that provides fast, accurate HTTP 1.1 protocol parsing in a portable way. Puma then serves the request in a thread from an internal thread pool (which you can control). This allows Puma to provide real concurrency for your web application!\n\nWith Rubinius 2.0, Puma will utilize all cores on your CPU with real threads, meaning you won't have to spawn multiple processes to increase throughput. You can expect to see a similar benefit from JRuby.\n\nOn MRI, there is a Global Interpreter Lock (GIL) that ensures only one thread can be run at a time. But if you're doing a lot of blocking IO (such as HTTP calls to external APIs like Twitter), Puma still improves MRI's throughput by allowing blocking IO to be run concurrently (EventMachine-based servers such as Thin turn off this ability, requiring you to use special libraries). Your mileage may vary. In order to get the best throughput, it is highly recommended that you use a Ruby implementation with real threads like [Rubinius](http://rubini.us) or [JRuby](http://jruby.org)."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]

metadata

@@ -2,7 +2,7 @@
 name: puma
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.1
+  version: 1.6.2
 platform: java
 authors: 
   - Evan Phoenix
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-12 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rack