trident 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdmMDA1Y2YzMDI4YzcyM2VkZDIyNmNjZTViYzVjZWJiZDAyNzE1Yw==
+    NWVkOTkzYzA0Y2Y4NGJjODIzZWI2ZjJmNzExOWQ3YWUyN2I3ZDQ2OA==
   data.tar.gz: !binary |-
-    NDUxYTk3ZGE5ZTRjZWNhZDVkMmEwYWY4Yjg5NTFhOTBiYWQyMjg4Ng==
+    YThjMjE1Y2Q4MWM1YWRiMDI4ZWU1N2ViNzMzNjg2NWNmM2FiMjdhZA==
 SHA512:
   metadata.gz: !binary |-
-    OWRhNzgzNzY4ODZkZDZjZGU1ZmZlMzQxMTA5ZGFmNDUyMjA4Yjc4YzMxNmFm
-    OTg4Y2VkNTdkZjU0MmM2ODc1NjRhNjM3ZWJiOWZiN2EzMzc2NDY0ZWU3NmY3
-    MjYxYmY5YWQ4ZjZjY2Y2M2MzNjA1OWFkNGJiNTI1MGU4ZDlkYTY=
+    OWNjOTRiYWE4YTUxMmI0ZWQ0MWZhOWEyMjc0ZWM5YTgzMGYxMmRjYTM3ODI3
+    MDU4ZWZiMDY0Mzc5ZTRlMTk0ZTBiN2MwZDI0YThhZjY5MjgwZDJkMGMxNDU5
+    ZTU0NDlmMDVkMzc1OGEwOTFmMjFlMDMxZDBmODk1NWI5OTJhMTc=
   data.tar.gz: !binary |-
-    ZjE0YzhiYzU0OWRjN2M3NTE0ZmIyMzBiNmJiNzI2ZGM2ODk2NjVjZjRlZDAy
-    MjEwNTc5MmQ2ZWVkNTdiNWYyYTRmYzEyNzcyMmY4YWFkNTMxMjliZTc3ZTQ3
-    MjZkZjFlOWQ0MzZhZWI5NWQ3NjUyMTdkYTZiMzMyYTE5M2QwZmU=
+    M2E4NTFmOTc2OWFlNzg2YWZmMGY4YmViODExNGQyYmEwODNlMzY2MjgyNjlh
+    ODI5Y2IyZmIzNTg0M2ZkMzQyOWE4NjZkN2UwMjY2NWNjMmE2MzZlZDI0NjRm
+    MDc1NmYzOGYxNTU1MGIzYzJlY2MwNmVhYWZlNzBkM2NiZTliNjM=

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.0 (11/19/2013)
+------------------
+
+don't implicitly set SIGCHLD, and reset back to default when appropriate <5a4f774> [Matt Conway]
+
 0.3.0 (11/19/2013)
 ------------------
 

data/lib/trident/signal_handler.rb

@@ -118,10 +118,6 @@ module Trident
 
         @signal_mappings[k] = Array(v)
       end
-
-      # Should always handle CHLD signals as they wakeup/drive the main
-      # loop on status changes from child processes
-      @signal_mappings = {"SIGCHLD" => ["update"]}.merge(@signal_mappings)
     end
 
     def setup_self_pipe
@@ -143,7 +139,13 @@ module Trident
 
     def reset_signal_handlers
       original_signal_handlers.each do |signal_name, original_handler|
-        trap(signal_name, original_handler)
+        if signal_name == "SIGCHLD" && original_handler == nil
+          # SIGCHLD handler needs to be default for stuff like
+          # Process.detach to work correctly
+          trap(signal_name, "DEFAULT")
+        else
+          trap(signal_name, original_handler)
+        end
       end
       original_signal_handlers.clear
     end

data/lib/trident/version.rb

@@ -1,3 +1,3 @@
 module Trident
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/unit/trident/signal_handler_test.rb

@@ -37,20 +37,6 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
     Marshal.load(result)
   end
 
-  context "#initialize" do
-
-    should "add in CHLD handler" do
-      handler = SignalHandler.new({}, Target.new)
-      assert_equal({"SIGCHLD" => ["update"]}, handler.signal_mappings)
-    end
-
-    should "allow CHLD handler replacement" do
-      handler = SignalHandler.new({"CHLD" => "foo"}, Target.new)
-      assert_equal({"SIGCHLD" => ["foo"]}, handler.signal_mappings)
-    end
-
-  end
-
   context "#signal_mappings==" do
 
     should "normalize signal names" do
@@ -59,7 +45,7 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
                    {"int" => "foo", "sigterm" => "bar",
                     "USR1" => "baz", "SIGUSR2" => ["bum", "hum"]}
 
-      assert_equal({"SIGCHLD" => ["update"], "SIGINT" => ["foo"],
+      assert_equal({"SIGINT" => ["foo"],
                     "SIGTERM" => ["bar"], "SIGUSR1" => ["baz"],
                     "SIGUSR2" => ["bum", "hum"]}, handler.signal_mappings)
     end
@@ -102,7 +88,6 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
 
       handler.expects(:trap_deferred).with("SIGINT")
       handler.expects(:trap_deferred).with("SIGTERM")
-      handler.expects(:trap_deferred).with("SIGCHLD")
       handler.send(:setup_signal_handlers)
     end
 
@@ -112,7 +97,7 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
 
       handler.stubs(:trap_deferred)
       handler.send(:setup_signal_handlers)
-      assert_equal({"SIGCHLD" => nil, "SIGINT" => nil, "SIGTERM" => nil},
+      assert_equal({"SIGINT" => nil, "SIGTERM" => nil},
                    handler.original_signal_handlers)
     end
 
@@ -137,11 +122,34 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
 
       handler.expects(:trap).with("SIGINT", nil)
       handler.expects(:trap).with("SIGTERM", nil)
-      handler.expects(:trap).with("SIGCHLD", nil)
       handler.send(:reset_signal_handlers)
       assert_empty handler.original_signal_handlers
     end
 
+    should "reset SIGCHLD to default" do
+      signals = {"chld" => "update"}
+      handler = SignalHandler.new(signals, Target.new)
+
+      handler.stubs(:trap_deferred)
+      handler.send(:setup_signal_handlers)
+
+      handler.expects(:trap).with("SIGCHLD", "DEFAULT")
+      handler.send(:reset_signal_handlers)
+      assert_empty handler.original_signal_handlers
+    end
+
+    should "reset signals to original when set" do
+      signals = {"int" => "foo", "chld" => "bar"}
+      handler = SignalHandler.new(signals, Target.new)
+
+      handler.stubs(:trap_deferred).returns("IGNORE")
+      handler.send(:setup_signal_handlers)
+
+      handler.expects(:trap).with("SIGINT", "IGNORE")
+      handler.expects(:trap).with("SIGCHLD", "IGNORE")
+      handler.send(:reset_signal_handlers)
+      assert_empty handler.original_signal_handlers
+    end
   end
 
   context "#handle_signal_queue" do
@@ -252,6 +260,25 @@ class Trident::SignalHandlerTest < MiniTest::Should::TestCase
       assert_equal [[:bar, [], nil], [:foo, [], nil], [:action_break, [], nil]], received
     end
 
+    should "preserve SIGCHLD behavior" do
+      fc1 = ForkChild.new do
+        target = Target.new
+        SignalHandler.start({"chld" => "foo"}, target)
+        fc2 = ForkChild.new do
+          SignalHandler.reset_for_fork
+          pid = fork do
+            sleep 0.1
+          end
+          wait_thr = Process.detach(pid)
+          wait_thr.value.nil? # this will be nil if CHLD handler is not "DEFAULT"
+        end
+        fc2.wait
+      end
+
+      received = fc1.wait
+      assert_equal false, received
+    end
+
     should "honor signal queue limit" do
       fc = ForkChild.new do
         $stderr.reopen("/dev/null")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trident
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Conway