perfectqueue 0.7.18 → 0.7.19

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-01-26 version 0.7.19
+
+* Don't stop MonitorThread while shutting down
+
+
 == 2012-01-15 version 0.7.18
 
 * Fixed expiration logic

data/lib/perfectqueue/version.rb

@@ -1,5 +1,5 @@
 module PerfectQueue
 
-VERSION = '0.7.18'
+VERSION = '0.7.19'
 
 end

data/lib/perfectqueue/worker.rb

@@ -7,6 +7,7 @@ class MonitorThread
     @engine = engine
     @log = @engine.log
     @backend = engine.backend
+    @finished = false
 
     @timeout = conf[:timeout] || 600
     @heartbeat_interval = conf[:heartbeat_interval] || @timeout*3/4
@@ -25,15 +26,14 @@ class MonitorThread
   end
 
   def start
-    @log.debug "running worker."
     @thread = Thread.new(&method(:run))
   end
 
   def run
-    until @engine.finished?
+    unless @finished
       @mutex.synchronize {
         while true
-          return if @engine.finished?
+          return if @finished
           break if @token
           @cond.wait(@mutex)
         end
@@ -48,7 +48,7 @@ class MonitorThread
     while true
       sleep 1
       @mutex.synchronize {
-        return if @engine.finished?
+        return if @finished
         return unless @token
         now = Time.now.to_i
         try_extend(now)
@@ -94,6 +94,7 @@ class MonitorThread
 
   def stop
     @mutex.synchronize {
+      @finished = true
       @cond.broadcast
     }
   end
@@ -151,25 +152,30 @@ class Worker
   end
 
   def start
+    @log.debug "running worker."
     @thread = Thread.new(&method(:run))
-    @monitor.start
   end
 
   def run
-    while true
-      @mutex.synchronize {
-        while true
-          return if @engine.finished?
-          break if @token
-          @cond.wait(@mutex)
+    @monitor.start
+    begin
+      while true
+        @mutex.synchronize {
+          while true
+            return if @engine.finished?
+            break if @token
+            @cond.wait(@mutex)
+          end
+        }
+        begin
+          process(@token, @task)
+        ensure
+          @token = nil
+          @engine.release_worker(self)
         end
-      }
-      begin
-        process(@token, @task)
-      ensure
-        @token = nil
-        @engine.release_worker(self)
       end
+    ensure
+      @monitor.stop
     end
   rescue
     @engine.stop($!)
@@ -205,7 +211,6 @@ class Worker
 
   def stop
     submit(nil, nil)
-    @monitor.stop
   end
 
   def shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70358573096320 !ruby/object:Gem::Requirement
+  requirement: &2253754180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70358573096320
+  version_requirements: *2253754180
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70358573087020 !ruby/object:Gem::Requirement
+  requirement: &2253753580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70358573087020
+  version_requirements: *2253753580
 description: 
 email: frsyuki@gmail.com
 executables: