thin-fun_embed 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 554cca8c4ae41336cb638483d6435f7e6b890c39
-  data.tar.gz: 6b247bd9fbc43b05020e5b18f0bcde245c993d2e
+  metadata.gz: 512fa7b71408f95661f0b1a58d691e776aca685d
+  data.tar.gz: 99743032ffaac47bf15a9e4e5d9e545f9e216d8e
 SHA512:
-  metadata.gz: f8b61923ba35ee4012c285462a7dc05c46ce5c5c09468a01e72dcccc6aae54ecbc1c6e1de2e01ee8bac0d8386e6a43df1f37cd2f3d8f769f459c5a1001bdd501
-  data.tar.gz: 8fb9978fcf053c339bf15d7aae8f8b99c9ce72ad2b96cd9ec8c7c637feb3e3a5f30ad67217c6780c3e334a091fd3bae0214d73642d6eef2d695a819bbd4fb419
+  metadata.gz: 7936654dad4567515ef60ff16b364edff7c3ede8843ae3e86f36f3418b9d7c6e2c9b00b6f2be07c6f14ee728ea98d7aac742e74f8a732445b824f5f406a46e5e
+  data.tar.gz: b73a4cb64bf6b9d6d4a596b22d9b34abcaa9b85b57e9fca953351be83bc7d87b636572b092c5b0848982d73f7862994e3f9773b7684c07a0efdf55870cf682a0

data/lib/thin/fun_daemon.rb

@@ -21,12 +21,13 @@ module Thin
     def self.trap
       return if @trap_set
       @trap_set = true
-      ::Signal.trap(:INT){ trap_call }
-      ::Signal.trap(:TERM){ trap_call }
-      ::Signal.trap(:QUIT){ trap_call }
+      @prev_traps = {}
+      [:INT, :TERM, :QUIT].each do |name|
+        @prev_traps[name] = ::Signal.trap(name){|sig| trap_call(name, sig) }
+      end
     end
 
-    def self.trap_call
+    def self.trap_call(name, sig)
       @trap_called = true
       Thread.new do
         EM.schedule do
@@ -35,16 +36,20 @@ module Thin
           end
           if @conns && !@conns.empty?
             @conns.each do |conn, _|
-              conn.close_connection_after_writing
+              conn.force_close!
             end
           else
             EM.next_tick{ EM.stop }
           end
         end
       end
-      ::Signal.trap(:INT, 'DEFAULT')
-      ::Signal.trap(:TERM, 'DEFAULT')
-      ::Signal.trap(:QUIT, 'DEFAULT')
+      @prev_traps.each do |nm, prev|
+        if nm == name && prev.respond_to?(:call)
+          prev.call(sig)
+          next
+        end
+        ::Signal.trap(nm, prev)
+      end
     end
 
     def self.run_class(host, port, klass, *args, &block)

data/lib/thin/fun_embed.rb

@@ -60,6 +60,7 @@ module Thin # :nodoc:
 
     def post_init
       @keep_alive = nil
+      @force_close = false
       @parser = Thin::Request.new
     end
 
@@ -166,7 +167,7 @@ module Thin # :nodoc:
     # call this when you fully send response
     def consider_keep_alive(try_keep_alive = true)
       @parser.close  rescue nil
-      if @keep_alive && try_keep_alive
+      if @keep_alive && try_keep_alive && !@force_close
         post_init
       else
         close_connection_after_writing
@@ -176,6 +177,10 @@ module Thin # :nodoc:
     def unbind # :nodoc:
       @unbind_callback && @unbind_callback.call(self)
     end
+
+    def force_close!
+      @force_close = true
+    end
   end
 
   class FunRackLike < FunEmbed

data/lib/thin/fun_embed/version.rb

@@ -1,6 +1,6 @@
 require 'eventmachine'
 module Thin # :nodoc:
   class FunEmbed < EM::Connection
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thin-fun_embed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sokolov Yura 'funny-falcon'