puma 1.6.1 → 1.6.2

data/Gemfile.lock

@@ -1,9 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    bouncy-castle-java (1.5.0146.1)
     hoe (3.0.7)
       rake (~> 0.8)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
     json (1.7.4)
+    json (1.7.4-java)
     rack (1.4.1)
     rake (0.9.2.2)
     rake-compiler (0.8.1)
@@ -12,6 +16,7 @@ GEM
       json (~> 1.4)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

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

@@ -1,116 +1,102 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: puma
-version: !ruby/object:Gem::Version
-  version: 1.6.1
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  - 2
+  version: 1.6.2
 platform: ruby
-authors:
+authors: 
 - Evan Phoenix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-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.
-
-
-  Under 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!
-
-
-  With 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.
-
-
-  On 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).'
-email:
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id004
+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.
+  
+  Under 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!
+  
+  With 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.
+  
+  On 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).
+email: 
 - evan@phx.io
-executables:
+executables: 
 - puma
 - pumactl
-extensions:
+extensions: 
 - ext/puma_http11/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-files:
+files: 
 - COPYING
 - Gemfile
 - Gemfile.lock
@@ -186,32 +172,41 @@ files:
 - tools/trickletest.rb
 homepage: http://puma.io
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: puma
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web
-  applications
-test_files:
+summary: Puma is a simple, fast, and highly concurrent HTTP 1.1 server for Ruby web applications
+test_files: 
 - test/test_app_status.rb
 - test/test_cli.rb
 - test/test_config.rb