rainbows-emtp 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a056ee3bba9e84ff779f854c5d3ca760ae64d29f
-  data.tar.gz: f53e6b8a43b906078fcc0df11016c44a5c594bfc
+  metadata.gz: 12ec1b107844d2d9afdebb13afb37a108215539e
+  data.tar.gz: cdbb172e772e976a83b519d2d8ec5c95d1a6c36b
 SHA512:
-  metadata.gz: 1ab106d2da425d72b1dfb9d15b0f4ccfb11df32dc53cdce48e6e4dc75b623031b7e7843262cbc6ba0c86938764c227de517ab954e7911d01186de08393e1c66d
-  data.tar.gz: d9a022f75d25a4711a4be24fec12a5f37df50ba6a9b0d33d49f0b307f333cf0200d9130f7f7eac6772db695b730ef7722d892d531e77ecf0dce2683528ee03ee
+  metadata.gz: 49e438d29dc3b33908232e97ef1873205210cbd84966289de085ac06ff37c943ba5c8baa0c9125058bf8e5709b85f56842764d90532e58f1c682c3ed47b2a369
+  data.tar.gz: 3614bba3b18a6fd41b6226f82b79ed37ccad5e6b0eba80a1a1e0308cf2538cf55d3571982220f0e3529a99bc6311560adbe00be1e195212a7a442679395daac6

data/Rakefile

@@ -8,7 +8,7 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     s.name    = 'rainbows-emtp'
-    s.version = '0.5.1'
+    s.version = '0.5.2'
 
     %w[rainbows eventmachine].each{ |g| s.add_runtime_dependency(g) }
   end

data/lib/rainbows/event_machine_thread_pool.rb

@@ -1,3 +1,4 @@
+# -*- encoding: binary -*-
 
 require 'rainbows'
 
@@ -6,8 +7,9 @@ module Rainbows::EventMachineThreadPool
   extend  Rainbows::PoolSize
   include Rainbows::EventMachine
 
-  def init_worker_process worker
+  def init_worker_process(worker)
     EM.threadpool_size = Rainbows::O[:pool_size]
+    logger.info "EventMachineThreadPool pool_size=#{Rainbows::O[:pool_size]}"
     super
   end
 end

data/lib/rainbows/event_machine_thread_pool/client.rb

@@ -1,44 +1,47 @@
-
-require 'rainbows/event_machine_thread_pool'
-
+# -*- encoding: binary -*-
+# :enddoc:
 class Rainbows::EventMachineThreadPool::Client <
       Rainbows::EventMachine::Client
 
+  def app_dispatch
+    EM.defer(method(:app_response), method(:response_write))
+  end
+
   def app_call input
-    # begin Copied from Rainbows::EventMachine::Client#app_call
+    @deferred = true # we defer immediately
     set_comm_inactivity_timeout 0
     @env[RACK_INPUT] = input
     @env[REMOTE_ADDR] = @_io.kgio_addr
     @env[ASYNC_CALLBACK] = method(:write_async_response)
     @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
     @hp.hijack_setup(@env, @_io)
-    # end Copied from Rainbows::EventMachine::Client#app_call
+    app_dispatch # must be implemented by subclass
+  end
 
-    @deferred = true # We defer immediately
-    EM.defer do      # Queue the application call to EM's job queue
-      begin
-        status, headers, body = catch(:async) {
-          APP.call(@env.merge!(RACK_DEFAULTS))
-        }
-        if @hp.hijacked?
-          @deferred = nil # User must handle everything by themselves
-          hijacked
-        elsif nil == status || -1 == status
-          @deferred = true
-        else
-          @deferred = nil
-          ev_write_response(status, headers, body, @hp.next?)
-        end
-      # Never ever crash any thread
-      rescue Exception => e
-        begin # Any user codes should be guarded
-          if handler = EM.instance_variable_get(:@error_handler)
-            handler.call(e)
-          end
-        rescue Exception
-        end
-        handle_error(e)
-      end
+  # this is only called in the master thread
+  def response_write(response)
+    if @hp.hijacked?
+      @deferred = nil
+      hijacked
+    elsif nil == response[0] || -1 == response[0]
+      @deferred = true
+    else
+      @deferred = nil
+      ev_write_response(*response, @hp.next?)
     end
+    rescue => e
+      @deferred = nil
+      handle_error(e)
+  end
+
+  # fails-safe application dispatch, we absolutely cannot
+  # afford to fail or raise an exception (killing the thread)
+  # here because that could cause a deadlock and we'd leak FDs
+  def app_response
+    APP.call(@env.merge!(RACK_DEFAULTS))
+    rescue => e
+      Rainbows::Error.app(e) # we guarantee this does not raise
+      [ 500, {}, [] ]
   end
+
 end

data/rainbows-emtp.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
+# stub: rainbows-emtp 0.5.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rainbows-emtp"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2013-08-24"
+  s.date = "2013-09-17"
   s.description = "EventMachineThreadPool model for Rainbows!"
   s.email = ["godfat (XD) godfat.org"]
   s.files = [
@@ -25,7 +26,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/godfat/rainbows-emtp"
   s.licenses = ["Apache License 2.0"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.1.3"
   s.summary = "EventMachineThreadPool model for Rainbows!"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rainbows-emtp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbows
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: EventMachineThreadPool model for Rainbows!