plum 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e0e1f798c885a09557e220ac446f6c0aa048efe
-  data.tar.gz: dd31a046c57dd142b85940f4b970e90441d2f490
+  metadata.gz: ef27822edb349c4af6092ad5e6fcfa7a197c4300
+  data.tar.gz: a958711115e3c29dbe9f084a831d8167005c873e
 SHA512:
-  metadata.gz: 7d19e7d4c6f8b868d6c12824d62848f1532fe34af9dd04bc7128396a51533bbfe6c9c68bb36456c63a90e5fc2a337994d76b89ce0aa32bccb03616edf878a91e
-  data.tar.gz: aae1851fa3169ffb041a7efd3563dceee256e7e2aed653e6a8ffe1d8b3163bb7a32977abe02bee7ef86a5d91e792d555d1dd19bac40b72820549fa11c07d154e
+  metadata.gz: 58378f43aee9a6c53e4b87d1e8f4b3a0969f79e10981eaf51af23327108d037e3d5dde0e56a090f04d749fae687262cdd45bb50f59e5201f90844568addc55c8
+  data.tar.gz: 1450a4e93f8a8929740c3cbd9edd5018294312cf55f87f928d0d0dbbe4c9596dca220e7c8f3a9d38113837c5d09c4d8b94c5b79ae17a607644eb3228a5913c03

data/.codeclimate.yml

@@ -0,0 +1,2 @@
+exclude_paths:
+- "examples/**/*"

data/examples/rack-example-config.rb

@@ -1,7 +1,7 @@
 log "logs/plum.log"
 debug false
 server_push true
-threaded false # create a new thread per request
+threadpool_size 20 # use 20 threads to process requests (default: 1( = disable))
 fallback_legacy "127.0.0.1:8080" # forward if client doesn't support HTTP/2
 
 user "nobody"

data/lib/plum/rack/cli.rb

@@ -44,7 +44,6 @@ module Plum
         ENV["RACK_ENV"] = @options[:env] if @options[:env]
         config[:debug] = @options[:debug] unless @options[:debug].nil?
         config[:server_push] = @options[:server_push] unless @options[:server_push].nil?
-        config[:threaded] = @options[:threaded] unless @options[:threaded].nil?
         config[:threadpool_size] = @options[:threadpool_size] unless @options[:threadpool_size].nil?
 
         if @options[:fallback_legacy]
@@ -121,11 +120,7 @@ module Plum
             @options[:key] = arg
           end
 
-          o.on "--threaded", "Call the Rack application in threads (experimental)" do
-            @options[:threaded] = true
-          end
-
-          o.on "--threadpool-size SIZE", "Set the size of thread pool" do |arg|
+          o.on "--threadpool-size SIZE", "Set the size of thread pool. Set 1 to disable" do |arg|
             @options[:threadpool_size] = arg.to_i
           end
 

data/lib/plum/rack/config.rb

@@ -7,8 +7,7 @@ module Plum
         debug: false,
         log: nil, # $stdout
         server_push: true,
-        threaded: false,
-        threadpool_size: 20,
+        threadpool_size: 1,
       }.freeze
 
       def initialize(config = {})

data/lib/plum/rack/dsl.rb

@@ -40,10 +40,6 @@ module Plum
           @config[:server_push] = !!bool
         end
 
-        def threaded(bool)
-          @config[:threaded] = !!bool
-        end
-
         def threadpool_size(int)
           @config[:threadpool_size] = int.to_i
         end

data/lib/plum/rack/legacy_session.rb

@@ -13,7 +13,7 @@ module Plum
 
       def run
         if @config[:fallback_legacy_host]
-          @logger.info "legacy HTTP: fallbacking to: #{@config[:fallback_legacy_host]}:#{@config[:fallback_legacy_port]}"
+          @svc.logger.info "legacy HTTP: fallbacking to: #{@config[:fallback_legacy_host]}:#{@config[:fallback_legacy_port]}"
           upstream = TCPSocket.open(@config[:fallback_legacy_host], @config[:fallback_legacy_port])
           upstream.write(@e.buf) if @e.buf
           loop do

data/lib/plum/rack/listener.rb

@@ -35,11 +35,11 @@ module Plum
             plum = ::Plum::HTTPServerConnection.new(sock.method(:write))
             sess = Session.new(svc, sock, plum)
             sess.run
-          rescue Errno::ECONNRESET, EOFError # closed
           rescue ::Plum::LegacyHTTPError => e
-            @logger.info "legacy HTTP client: #{e}"
+            svc.logger.info "legacy HTTP client: #{e}"
             sess = LegacySession.new(svc, e, sock)
             sess.run
+          rescue Errno::ECONNRESET, EOFError # closed
           rescue => e
             svc.log_exception(e)
           ensure
@@ -97,11 +97,11 @@ module Plum
             plum = ::Plum::ServerConnection.new(sock.method(:write))
             sess = Session.new(svc, sock, plum)
             sess.run
-          rescue Errno::ECONNRESET, EOFError # closed
           rescue ::Plum::LegacyHTTPError => e
-            @logger.info "legacy HTTP client: #{e}"
+            svc.logger.info "legacy HTTP client: #{e}"
             sess = LegacySession.new(svc, e, sock)
             sess.run
+          rescue Errno::ECONNRESET, EOFError # closed
           rescue => e
             svc.log_exception(e)
           ensure

data/lib/plum/rack/server.rb

@@ -10,7 +10,7 @@ module Plum
         @app = config[:debug] ? ::Rack::CommonLogger.new(app) : app
         @logger = Logger.new(config[:log] || $stdout).tap { |l| l.level = config[:debug] ? Logger::DEBUG : Logger::INFO }
         @listeners = config[:listeners].map { |lc| lc[:listener].new(lc) }
-        @threadpool = ThreadPool.new(@config[:threadpool_size]) if @config[:threaded]
+        @threadpool = ThreadPool.new(@config[:threadpool_size]) if @config[:threadpool_size] > 1
 
         @logger.info("Plum #{::Plum::VERSION}")
         @logger.info("Config: #{config}")
@@ -51,11 +51,11 @@ module Plum
         # TODO: gracefully shutdown connections (wait threadpool?)
       end
 
-      private
       def log_exception(e)
         @logger.error("#{e.class}: #{e.message}\n#{e.backtrace.map { |b| "\t#{b}" }.join("\n")}")
       end
 
+      private
       def drop_privileges
         begin
           user = @config[:user]

data/lib/plum/rack/session.rb

@@ -19,6 +19,8 @@ module Plum
         @threadpool = svc.threadpool
 
         setup_plum
+      rescue Errno::ENOTCONN
+        # TCP connection reset while doing TLS handshake
       end
 
       def stop

data/lib/plum/rack/thread_pool.rb

@@ -2,7 +2,7 @@
 module Plum
   module Rack
     class ThreadPool
-      def initialize(size = 20)
+      def initialize(size)
         @workers = Set.new
         @jobs = Queue.new
 

data/lib/plum/stream.rb

@@ -221,11 +221,11 @@ module Plum
 
     def receive_priority_payload(payload)
       esd = payload.uint32
-      e = esd >> 31
-      dependency_id = e & ~(1 << 31)
+      e = (esd >> 31) == 1
+      dependency_id = esd & ~(1 << 31)
       weight = payload.uint8(4)
 
-      update_dependency(weight: weight, parent: @connection.streams[dependency_id], exclusive: e == 1)
+      update_dependency(weight: weight, parent: @connection.streams[dependency_id], exclusive: e)
     end
 
     def receive_rst_stream(frame)

data/lib/plum/version.rb

@@ -1,4 +1,4 @@
 # -*- frozen-string-literal: true -*-
 module Plum
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/lib/rack/handler/plum.rb

@@ -15,7 +15,8 @@ module Rack
               port: opts[:Port].to_i
             }
           ],
-          debug: !!opts[:Debug]
+          debug: !!opts[:Debug],
+          threadpool_size: opts[:Threads].to_i
         )
 
         @server = ::Plum::Rack::Server.new(app, config)
@@ -29,9 +30,10 @@ module Rack
 
       def self.valid_options
         {
-          "Host=HOST"    => "Hostname to listen on (default: #{default_options[:Host]})",
-          "Port=PORT"    => "Port to listen on (default: #{default_options[:Port]})",
-          "Debug"        => "Turn on debug mode (default: #{default_options[:Debug]})",
+          "Host=HOST"   => "Hostname to listen on (default: #{default_options[:Host]})",
+          "Port=PORT"   => "Port to listen on (default: #{default_options[:Port]})",
+          "Debug"       => "Turn on debug mode (default: #{default_options[:Debug]})",
+          "Threads=N"   => "Use N threads (default: #{default_options[:Threads]})",
         }
       end
 
@@ -43,6 +45,7 @@ module Rack
           Host: dev ? "localhost" : "0.0.0.0",
           Port: 8080,
           Debug: dev,
+          Threads: 20,
         }
       end
     end

data/test/plum/stream/test_handle_frame.rb

@@ -192,7 +192,7 @@ class StreamHandleFrameTest < Minitest::Test
   def test_stream_handle_priority_self_depend
     open_server_connection {|con|
       stream = open_new_stream(con)
-      payload = "".push_uint32((1 << 31) | stream.id).push_uint8(6)
+      payload = "".push_uint32((0 << 31) | stream.id).push_uint8(6)
       stream.receive_frame(Frame.new(type: :priority,
                                      stream_id: stream.id,
                                      payload: payload))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plum
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - rhenium
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile