pastry 0.3.0 → 0.3.1

data/lib/pastry.rb

@@ -95,6 +95,31 @@ class Pastry
     @logger ||= Logger.new(logfile || (daemonize ? '/tmp/pastry.log' : $stdout), 0)
   end
 
+  def respawn!
+    Thread.exclusive do
+      died = pids.select {|pid| Process.waitpid(pid, Process::WNOHANG) rescue 0} # find dead pids
+      died = died.reject {|pid| Process.kill(0, pid) rescue nil} # make sure what's dead is dead
+
+      died.each do |pid|
+        logger.info "process #{pid} died, starting a new one"
+        if idx = pids.index(pid)
+          pids[idx] = run(server, idx)
+        end
+      end
+    end
+  end
+
+  def start_command_listener io
+    Thread.new do
+      while command = io.gets
+        case command
+          when /SIGCHLD/
+            respawn! if @running
+        end
+      end
+    end
+  end
+
   def start!
     create_pidfile
     server   = ENV['PASTRY_FD'] && Socket.for_fd(ENV['PASTRY_FD'].to_i)
@@ -121,19 +146,11 @@ class Pastry
     @running   = true
     @pids      = pool.times.map {|idx| run(server, idx) }
 
-    Signal.trap('CHLD') do
-      if @running
-        Thread.exclusive do
-          died = pids.select {|pid| Process.waitpid(pid, Process::WNOHANG) rescue 0} # find dead pids
-          died = died.reject {|pid| Process.kill(0, pid) rescue nil} # make sure what's dead is dead
-
-          died.each do |pid|
-            logger.info "process #{pid} died, starting a new one"
-            if idx = pids.index(pid)
-              pids[idx] = run(server, idx)
-            end
-          end
-        end
+    # hack to avoid deadlocks in signal handler
+    IO.pipe.tap do |reader, writer|
+      start_command_listener(reader)
+      Signal.trap('CHLD') do
+        writer.puts 'SIGCHLD'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pastry
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 3318781981847808244
+      hash: -4338099220466715262
       version: '0'
       segments:
       - 0