puma 2.4.0 → 2.4.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.4.1 / 2013-08-07
+
+* 1 experimental feature:
+  * Support raw tcp servers (aka Lopez Express mode)
+
 === 2.4.0 / 2013-07-22
 
 * 5 minor features:

data/Manifest.txt

@@ -51,6 +51,7 @@ lib/puma/reactor.rb
 lib/puma/runner.rb
 lib/puma/server.rb
 lib/puma/single.rb
+lib/puma/tcp_logger.rb
 lib/puma/thread_pool.rb
 lib/puma/util.rb
 lib/rack/handler/puma.rb

data/lib/puma/cli.rb

@@ -186,6 +186,10 @@ module Puma
           end
         end
 
+        o.on "--tcp-mode", "Run the app in raw TCP mode instead of HTTP mode" do
+          @options[:mode] = :tcp
+        end
+
         o.on "-V", "--version", "Print the version information" do
           puts "puma version #{Puma::Const::VERSION}"
           exit 1

data/lib/puma/client.rb

@@ -22,11 +22,15 @@ module Puma
   class Client
     include Puma::Const
 
-    def initialize(io, env)
+    def initialize(io, env=nil)
       @io = io
       @to_io = io.to_io
       @proto_env = env
-      @env = env.dup
+      if !env
+        @env = nil
+      else
+        @env = env.dup
+      end
 
       @parser = HttpParser.new
       @parsed_bytes = 0

data/lib/puma/configuration.rb

@@ -17,6 +17,7 @@ module Puma
 
     def initialize(options)
       @options = options
+      @options[:mode] ||= :http
       @options[:binds] ||= []
       @options[:on_restart] ||= []
       @options[:worker_boot] ||= []
@@ -99,6 +100,13 @@ module Puma
         end
       end
 
+      if @options[:mode] == :tcp
+        require 'puma/tcp_logger'
+
+        logger = @options[:logger] || STDOUT
+        return TCPLogger.new(logger, app, @options[:quiet])
+      end
+
       if !@options[:quiet] and @options[:environment] == "development"
         logger = @options[:logger] || STDOUT
         app = Rack::CommonLogger.new(app, logger)
@@ -303,6 +311,11 @@ module Puma
         @options[:worker_directory] = dir.to_s
       end
 
+      # Run the app as a raw TCP app instead of an HTTP rack app
+      def tcp_mode
+        @options[:mode] = :tcp
+      end
+
       # *Cluster mode only* Preload the application before starting
       # the workers and setting up the listen ports. This conflicts
       # with using the phased restart feature, you can't use both.

data/lib/puma/const.rb

@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.4.0".freeze
+    PUMA_VERSION = VERSION = "2.4.1".freeze
     CODE_NAME = "Crunchy Munchy Lunchy"
 
     FAST_TRACK_KA_TIMEOUT = 0.2

data/lib/puma/runner.rb

@@ -70,6 +70,10 @@ module Puma
       log "* Version #{Puma::Const::PUMA_VERSION}, codename: #{Puma::Const::CODE_NAME}"
       log "* Min threads: #{min_t}, max threads: #{max_t}"
       log "* Environment: #{ENV['RACK_ENV']}"
+
+      if @options[:mode] == :tcp
+        log "* Mode: Lopez Express (tcp)"
+      end
     end
 
     def redirect_io
@@ -120,6 +124,10 @@ module Puma
       server.max_threads = max_t
       server.inherit_binder @cli.binder
 
+      if @options[:mode] == :tcp
+        server.tcp_mode!
+      end
+
       unless development?
         server.leak_stack_on_error = false
       end

data/lib/puma/server.rb

@@ -75,6 +75,8 @@ module Puma
       @options = options
 
       ENV['RACK_ENV'] ||= "development"
+
+      @mode = :http
     end
 
     attr_accessor :binder, :leak_stack_on_error
@@ -88,6 +90,10 @@ module Puma
       @own_binder = false
     end
 
+    def tcp_mode!
+      @mode = :tcp
+    end
+
     # On Linux, use TCP_CORK to better control how the TCP stack
     # packetizes our stream. This improves both latency and throughput.
     #
@@ -121,6 +127,87 @@ module Puma
       @thread_pool and @thread_pool.spawned
     end
 
+    # Lopez Mode == raw tcp apps
+
+    def run_lopez_mode(background=true)
+      @thread_pool = ThreadPool.new(@min_threads,
+                                    @max_threads,
+                                    Hash) do |client, tl|
+
+        io = client.to_io
+        addr = io.peeraddr.last
+
+        if addr.empty?
+          # Set unix socket addrs to localhost
+          addr = "127.0.0.1:0"
+        else
+          addr = "#{addr}:#{io.peeraddr[1]}"
+        end
+
+        env = { 'thread' => tl, REMOTE_ADDR => addr }
+
+        begin
+          @app.call env, client.to_io
+        rescue Object => e
+          STDERR.puts "! Detected exception at toplevel: #{e.message} (#{e.class})"
+          STDERR.puts e.backtrace
+        end
+
+        client.close unless env['detach']
+      end
+
+      if background
+        @thread = Thread.new { handle_servers_lopez_mode }
+        return @thread
+      else
+        handle_lopez_servers
+      end
+    end
+
+    def handle_servers_lopez_mode
+      begin
+        check = @check
+        sockets = [check] + @binder.ios
+        pool = @thread_pool
+
+        while @status == :run
+          begin
+            ios = IO.select sockets
+            ios.first.each do |sock|
+              if sock == check
+                break if handle_check
+              else
+                begin
+                  if io = sock.accept_nonblock
+                    c = Client.new io, nil
+                    pool << c
+                  end
+                rescue SystemCallError
+                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
+        end
+
+        graceful_shutdown if @status == :stop || @status == :restart
+
+      rescue Exception => e
+        STDERR.puts "Exception handling servers: #{e.message} (#{e.class})"
+        STDERR.puts e.backtrace
+      ensure
+        @check.close
+        @notify.close
+
+        if @status != :restart and @own_binder
+          @binder.close
+        end
+      end
+    end
     # Runs the server.
     #
     # If +background+ is true (the default) then a thread is spun
@@ -132,6 +219,10 @@ module Puma
 
       @status = :run
 
+      if @mode == :tcp
+        return run_lopez_mode(background)
+      end
+
       @thread_pool = ThreadPool.new(@min_threads,
                                     @max_threads,
                                     IOBuffer) do |client, buffer|

data/lib/puma/tcp_logger.rb

@@ -0,0 +1,32 @@
+module Puma
+  class TCPLogger
+    def initialize(logger, app, quiet=false)
+      @logger = logger
+      @app = app
+      @quiet = quiet
+    end
+
+    FORMAT = "%s - %s"
+
+    def log(who, str)
+      now = Time.now.strftime("%d/%b/%Y %H:%M:%S")
+
+      @logger.puts "#{now} - #{who} - #{str}"
+    end
+
+    def call(env, socket)
+      who = env[Const::REMOTE_ADDR]
+      log who, "connected" unless @quiet
+
+      env['log'] = lambda { |str| log(who, str) }
+
+      begin
+        @app.call env, socket
+      rescue Object => e
+        log who, "exception: #{e.message} (#{e.class})"
+      else
+        log who, "disconnected" unless @quiet
+      end
+    end
+  end
+end

data/puma.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.4.0"
+  s.version = "2.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-07-22"
+  s.date = "2013-08-07"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]
   s.extensions = ["ext/puma_http11/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.md", "docs/config.md", "docs/nginx.md", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/upstart/README.md"]
-  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/cluster.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/runner.rb", "lib/puma/server.rb", "lib/puma/single.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "tools/trickletest.rb", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.files = ["COPYING", "Gemfile", "History.txt", "LICENSE", "Manifest.txt", "README.md", "Rakefile", "TODO", "bin/puma", "bin/pumactl", "docs/config.md", "docs/nginx.md", "ext/puma_http11/PumaHttp11Service.java", "ext/puma_http11/ext_help.h", "ext/puma_http11/extconf.rb", "ext/puma_http11/http11_parser.c", "ext/puma_http11/http11_parser.h", "ext/puma_http11/http11_parser.java.rl", "ext/puma_http11/http11_parser.rl", "ext/puma_http11/http11_parser_common.rl", "ext/puma_http11/io_buffer.c", "ext/puma_http11/mini_ssl.c", "ext/puma_http11/org/jruby/puma/Http11.java", "ext/puma_http11/org/jruby/puma/Http11Parser.java", "ext/puma_http11/org/jruby/puma/MiniSSL.java", "ext/puma_http11/puma_http11.c", "lib/puma.rb", "lib/puma/accept_nonblock.rb", "lib/puma/app/status.rb", "lib/puma/binder.rb", "lib/puma/capistrano.rb", "lib/puma/cli.rb", "lib/puma/client.rb", "lib/puma/cluster.rb", "lib/puma/compat.rb", "lib/puma/configuration.rb", "lib/puma/const.rb", "lib/puma/control_cli.rb", "lib/puma/daemon_ext.rb", "lib/puma/delegation.rb", "lib/puma/detect.rb", "lib/puma/events.rb", "lib/puma/io_buffer.rb", "lib/puma/java_io_buffer.rb", "lib/puma/jruby_restart.rb", "lib/puma/minissl.rb", "lib/puma/null_io.rb", "lib/puma/rack_default.rb", "lib/puma/rack_patch.rb", "lib/puma/reactor.rb", "lib/puma/runner.rb", "lib/puma/server.rb", "lib/puma/single.rb", "lib/puma/tcp_logger.rb", "lib/puma/thread_pool.rb", "lib/puma/util.rb", "lib/rack/handler/puma.rb", "puma.gemspec", "tools/jungle/README.md", "tools/jungle/init.d/README.md", "tools/jungle/init.d/puma", "tools/jungle/init.d/run-puma", "tools/jungle/upstart/README.md", "tools/jungle/upstart/puma-manager.conf", "tools/jungle/upstart/puma.conf", "tools/trickletest.rb", "test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_tcp_rack.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
   s.homepage = "http://puma.io"
   s.rdoc_options = ["--main", "README.md"]
   s.require_paths = ["lib"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "puma"
   s.rubygems_version = "1.8.25"
   s.summary = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications"
-  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
+  s.test_files = ["test/test_app_status.rb", "test/test_cli.rb", "test/test_config.rb", "test/test_http10.rb", "test/test_http11.rb", "test/test_integration.rb", "test/test_iobuffer.rb", "test/test_minissl.rb", "test/test_null_io.rb", "test/test_persistent.rb", "test/test_puma_server.rb", "test/test_rack_handler.rb", "test/test_rack_server.rb", "test/test_tcp_rack.rb", "test/test_thread_pool.rb", "test/test_unix_socket.rb", "test/test_ws.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_tcp_rack.rb

@@ -0,0 +1,42 @@
+require "rbconfig"
+require 'test/unit'
+require 'socket'
+require 'openssl'
+
+require 'puma/minissl'
+require 'puma/server'
+
+require 'net/https'
+
+class TestTCPRack < Test::Unit::TestCase
+
+  def setup
+    @port = 3212
+    @host = "127.0.0.1"
+
+    @events = Puma::Events.new STDOUT, STDERR
+    @server = Puma::Server.new nil, @events
+  end
+
+  def teardown
+    @server.stop(true)
+  end
+
+  def test_passes_the_socket
+    @server.tcp_mode!
+
+    body = "We sell hats for a discount!\n"
+
+    @server.app = proc do |env, socket|
+      socket << body
+      socket.close
+    end
+
+    @server.add_tcp_listener @host, @port
+    @server.run
+
+    sock = TCPSocket.new @host, @port
+
+    assert_equal body, sock.read
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,6 +155,7 @@ files:
 - lib/puma/runner.rb
 - lib/puma/server.rb
 - lib/puma/single.rb
+- lib/puma/tcp_logger.rb
 - lib/puma/thread_pool.rb
 - lib/puma/util.rb
 - lib/rack/handler/puma.rb
@@ -180,6 +181,7 @@ files:
 - test/test_puma_server.rb
 - test/test_rack_handler.rb
 - test/test_rack_server.rb
+- test/test_tcp_rack.rb
 - test/test_thread_pool.rb
 - test/test_unix_socket.rb
 - test/test_ws.rb
@@ -224,6 +226,7 @@ test_files:
 - test/test_puma_server.rb
 - test/test_rack_handler.rb
 - test/test_rack_server.rb
+- test/test_tcp_rack.rb
 - test/test_thread_pool.rb
 - test/test_unix_socket.rb
 - test/test_ws.rb