perfectqueue 0.8.12 → 0.8.13

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-10 version 0.8.13
+
+* Force stop a processor when unknown exception occured during task heartbeat
+
+
 == 2012-08-05 version 0.8.12
 
 * Support 'process detach' feature for a replacement of binary replace

data/lib/perfectqueue/multiprocess/child_process.rb

@@ -63,8 +63,13 @@ module PerfectQueue
       def child_heartbeat
         @wpipe.write HEARTBEAT_PACKET
       rescue
-        @log.error "Parent process unexpectedly died. Exiting processor pid=#{Process.pid}: #{$!}"
-        stop(true)
+        @log.error "Parent process unexpectedly died: #{$!}"
+        force_stop
+      end
+
+      # override
+      def force_stop
+        super
         Process.kill(:KILL, Process.pid)
         exit! 137
       end

data/lib/perfectqueue/multiprocess/thread_processor.rb

@@ -27,7 +27,7 @@ module PerfectQueue
         @running_flag = BlockingFlag.new
         @finish_flag = BlockingFlag.new
 
-        @tm = TaskMonitor.new(config, method(:child_heartbeat))
+        @tm = TaskMonitor.new(config, method(:child_heartbeat), method(:force_stop))
 
         restart(false, config)
       end
@@ -74,6 +74,12 @@ module PerfectQueue
         @finish_flag.set!
       end
 
+      def force_stop
+        @log.error "Force stopping processor processor_id=#{@processor_id}"
+        @tm.stop_task(true)
+        @finish_flag.set!
+      end
+
       def logrotated
         # do nothing
       end

data/lib/perfectqueue/task_monitor.rb

@@ -19,10 +19,11 @@
 module PerfectQueue
 
   class TaskMonitor
-    def initialize(config, child_heartbeat=nil)
+    def initialize(config, child_heartbeat=nil, force_stop=nil)
       @config = config
       @log = config[:logger]
       @child_heartbeat = child_heartbeat || Proc.new {}
+      @force_stop = force_stop || Proc.new {}
 
       @child_heartbeat_interval = (@config[:child_heartbeat_interval] || 2).to_i
       @task_heartbeat_interval = (@config[:task_heartbeat_interval] || 2).to_i
@@ -135,15 +136,16 @@ module PerfectQueue
         end
       }
     rescue
-      @log.error "Unknown error #{$!.class}: #{$!}. Exiting worker pid=#{Process.pid}"
+      @log.error "Unknown error #{$!.class}: #{$!}"
       $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
+      @force_stop.call
     end
 
     private
     def task_heartbeat
       @task.heartbeat! :message => @heartbeat_message
       @heartbeat_message = nil
-    rescue TaskError
+    rescue
       # finished, cancel_requested, preempted, etc.
       kill_task($!)
     end

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.12"
+  VERSION = "0.8.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel