servolux 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.8.1 / 2009-11-12
+
+* 3 Bug Fixes
+  * Attempting to wakeup a dead thread in Prefork
+  * Shutdown error between the Prefork parent/child
+  * Restart was not working properly
+
 == 0.8.0 / 2009-11-12
 
 * 2 Major Enhancements

data/a.rb

@@ -12,20 +12,23 @@ module DoThis
   end
 
   def after_executing
+STDOUT.puts "Closing #$$.txt"
     @fd.close
   end
 
   def execute
     @fd.puts "Process #$$ @ #{Time.now}"
-    sleep 5
+    sleep 2
   end
 end
 
-p = Servolux::Prefork.new :module => DoThis, :timeout => 0.5
+p = Servolux::Prefork.new :module => DoThis
 p.start 6
-sleep 10
+gets
 p.stop
 
-p.errors { |e|
-  puts e.inspect
+p.errors { |w|
+  puts w.error.inspect
 }
+
+Process.waitall

data/lib/servolux/prefork.rb

@@ -227,7 +227,7 @@ class Servolux::Prefork
       return if @thread.nil? or @piper.nil? or @piper.child?
 
       @thread[:stop] = true
-      @thread.wakeup
+      @thread.wakeup if @thread.status
       Thread.pass until !@thread.status
       kill 'HUP'
       @thread = nil
@@ -285,7 +285,7 @@ class Servolux::Prefork
             when START; break
             when ERROR
               raise Timeout,
-                    "Child did not respond in a timely fashion. Timeout is set to #{@prefork.timeout} seconds."
+                    "Child did not respond in a timely fashion. Timeout is set to #{@prefork.timeout.inspect} seconds."
             when Exception
               raise response
             else
@@ -296,10 +296,10 @@ class Servolux::Prefork
         rescue Exception => err
           @error = err
         ensure
-          @piper.timeout = 0
+          @piper.timeout = 0.1
           @piper.puts HALT rescue nil
           @piper.close
-          self.start if START == response
+          self.start if START == response and !Thread.current[:stop]
         end
       }
       Thread.pass until @thread[:stop] == false
@@ -332,7 +332,7 @@ class Servolux::Prefork
           break
         when ERROR
           raise Timeout,
-                "Parent did not respond in a timely fashion. Timeout is set to #{@prefork.timeout} seconds."
+                "Parent did not respond in a timely fashion. Timeout is set to #{@prefork.timeout.inspect} seconds."
         else
           raise UnknownSignal,
                 "Child received unknown signal: #{signal.inspect}"

data/lib/servolux.rb

@@ -2,7 +2,7 @@
 module Servolux
 
   # :stopdoc:
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Tim Pease