einhorn 0.4.5 → 0.4.6

data/lib/einhorn/command/interface.rb

@@ -147,25 +147,25 @@ module Einhorn::Command
 
     ## Signals
     def self.install_handlers
-      Signal.trap("INT") do
+      trap_async("INT") do
         Einhorn::Command.signal_all("USR2", Einhorn::WorkerPool.workers)
         Einhorn::Command.stop_respawning
       end
-      Signal.trap("TERM") do
+      trap_async("TERM") do
         Einhorn::Command.signal_all("TERM", Einhorn::WorkerPool.workers)
         Einhorn::Command.stop_respawning
       end
       # Note that quit is a bit different, in that it will actually
       # make Einhorn quit without waiting for children to exit.
-      Signal.trap("QUIT") do
+      trap_async("QUIT") do
         Einhorn::Command.signal_all("QUIT", Einhorn::WorkerPool.workers)
         Einhorn::Command.stop_respawning
         exit(1)
       end
-      Signal.trap("HUP") {Einhorn::Command.reload}
-      Signal.trap("ALRM") {Einhorn::Command.full_upgrade}
-      Signal.trap("CHLD") {Einhorn::Event.break_loop}
-      Signal.trap("USR2") do
+      trap_async("HUP") {Einhorn::Command.reload}
+      trap_async("ALRM") {Einhorn::Command.full_upgrade}
+      trap_async("CHLD") {}
+      trap_async("USR2") do
         Einhorn::Command.signal_all("USR2", Einhorn::WorkerPool.workers)
         Einhorn::Command.stop_respawning
       end
@@ -177,6 +177,16 @@ module Einhorn::Command
       end
     end
 
+    def self.trap_async(signal, &blk)
+      Signal.trap(signal) do
+        # We try to do as little work in the signal handler as
+        # possible. This avoids potential races between e.g. iteration
+        # and mutation.
+        Einhorn::Event.break_loop
+        Einhorn::Event.register_signal_action(&blk)
+      end
+    end
+
     def self.remove_handlers
       %w{INT TERM QUIT HUP ALRM CHLD USR2}.each do |signal|
         Signal.trap(signal, "DEFAULT")

data/lib/einhorn/event.rb

@@ -4,6 +4,7 @@ module Einhorn
   module Event
     @@loopbreak_reader = nil
     @@loopbreak_writer = nil
+    @@signal_actions = []
     @@readable = {}
     @@writeable = {}
     @@timers = {}
@@ -47,6 +48,10 @@ module Einhorn
       end
     end
 
+    def self.register_signal_action(&blk)
+      @@signal_actions << blk
+    end
+
     def self.register_readable(reader)
       @@readable[reader.to_io] ||= Set.new
       @@readable[reader.to_io] << reader
@@ -95,6 +100,7 @@ module Einhorn
     end
 
     def self.loop_once
+      run_signal_actions
       run_selectables
       run_timers
     end
@@ -108,6 +114,16 @@ module Einhorn
       end
     end
 
+    def self.run_signal_actions
+      # Note thah @@signal_actions can be mutated in the signal
+      # handlers. Since it's just an array we push to/shift from, we
+      # can be sure there's no race (such as adding hash keys during
+      # iteration.)
+      while blk = @@signal_actions.shift
+        blk.call
+      end
+    end
+
     def self.run_selectables
       time = timeout
       Einhorn.log_debug("Loop timeout is #{time.inspect}")

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake