xpool 0.10.0 → 0.10.1

data/ChangeLog.txt

@@ -1,3 +1,23 @@
+== HEAD
+	- no longer log from trap(…) block.
+	the logger cannot log from within a trap block on Ruby2, so I've removed 
+	logging when a subprocess gets a request to shutdown.
+
+	- call 'setup' on unit of work if defined. 
+	'setup', if defined by a unit of work, is called just before a unit of work 
+	is executed for the first time… useful if you need to create an environment 
+	for the subprocess to operate in.
+
+	- resize & resize! no longer accepts a Range.
+	deprecated in the last release, support for a Range to either resize or
+	resize! is completely removed in this release. Please use a Fixnum instead.
+
+== v0.10.1
+	- Restarted subprocesses inherit the message queue of their predecessor.
+	when a failed subprocess is restarted its message queue is inherited by its
+	replacement. Any messages it had waiting will be processed by the replacement 
+	process.
+
 == v0.10.0
 	- default to two subprocesses if CPU core count cannot be guessed.
 	Which is change from the old default of five.

data/lib/xpool/process.rb

@@ -4,6 +4,7 @@ class XPool::Process
   #   Returns an instance of XPool::Process
   #
   def initialize
+    reset
     @id = spawn
   end
 
@@ -115,25 +116,32 @@ class XPool::Process
     @states[:backtrace]
   end
 
+  #
+  # Restart the process. The current process shuts down(gracefully) and a new
+  # process replaces it. If the current process has failed the new process will
+  # inherit its message queue.
   #
   # @return [Fixnum]
   #   Returns the process ID of the new process.
   #
   def restart
-    shutdown
+    _shutdown 'SIGUSR1', false
+    reset(false)
     @id = spawn
   end
 
 private
-  def _shutdown(sig)
+  def _shutdown(sig, close_channels=true)
     Process.kill sig, @id
     Process.wait @id
   rescue Errno::ECHILD, Errno::ESRCH
   ensure
     @states = {dead: true} unless failed?
     @shutdown = true
-    @channel.close
-    @s_channel.close
+    if close_channels
+      @channel.close
+      @s_channel.close
+    end
   end
 
   def synchronize!
@@ -144,16 +152,17 @@ private
     @states
   end
 
-  def reset
-    @channel = IChannel.new Marshal
-    @s_channel = IChannel.new Marshal
+  def reset(new_channels = true)
+    if new_channels
+      @channel = IChannel.new Marshal
+      @s_channel = IChannel.new Marshal
+    end
     @shutdown = false
     @states = {}
     @frequency = 0
   end
 
   def spawn
-    reset
     fork do
       trap :SIGUSR1 do
         XPool.log "#{::Process.pid} got request to shutdown."
@@ -172,8 +181,8 @@ private
     end
     sleep 0.05
   rescue Exception => e
-    XPool.log "#{::Process.pid} has failed."
     @s_channel.put failed: true, dead: true, backtrace: e.backtrace
+    XPool.log "Process with ID '#{@id}' has failed."
     raise e
   ensure
     if @shutdown_requested && !@channel.readable?

data/lib/xpool/version.rb

@@ -1,3 +1,3 @@
 class XPool
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/test/support/io_writer.rb

@@ -13,9 +13,21 @@ class IOWriter
   end
 
   def wrote_to_disk?
-    return @wrote_to_disk if defined?(@wrote_to_disk)
-    @wrote_to_disk = File.read(@path) == 'true'
-    FileUtils.rm_rf @path
-    @wrote_to_disk
+    if File.exist? @path
+      val = File.read(@path)
+      FileUtils.rm_rf @path
+      val == 'true'
+    end
+  end
+end
+
+class IOSetupWriter < IOWriter
+  def setup
+    File.open @path, 'w' do |f|
+      f.write 'true'
+    end
+  end
+
+  def run
   end
 end

data/test/support/raiser.rb

@@ -1,5 +1,10 @@
 class Raiser
+  def initialize(seconds = 0)
+    @seconds = seconds
+  end
+
   def run
+    sleep @seconds
     raise RuntimeError, "", %w(42)
   end
 end

data/test/xpool_process_test.rb

@@ -8,6 +8,16 @@ class XPoolProcessTest < Test::Unit::TestCase
     @process.shutdown!
   end
 
+  def test_resume_process_on_failed_process_queue
+    @process.schedule Raiser.new(0.1)
+    io_writers = Array.new(5) { IOWriter.new }
+    io_writers.each { |writer| @process.schedule writer }
+    until @process.failed?; sleep 0.1; end
+    @process.restart
+    sleep 0.5
+    io_writers.each { |io_writer| assert io_writer.wrote_to_disk? }
+  end
+
   def test_busy_method
     @process.schedule Sleeper.new(0.5)
     sleep 0.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xpool
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ichannel
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088700810187342227
+      hash: -3457064609731373945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4088700810187342227
+      hash: -3457064609731373945
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23