queue_classic 0.3.5.pre → 0.3.7.pre

data/lib/queue_classic/database.rb

@@ -27,6 +27,11 @@ module QC
       execute("SET application_name = 'queue_classic'")
     end
 
+    def notify
+      log("NOTIFY")
+      execute("NOTIFY queue_classic_jobs")
+    end
+
     def listen
       log("LISTEN")
       execute("LISTEN queue_classic_jobs")
@@ -37,9 +42,15 @@ module QC
       execute("UNLISTEN queue_classic_jobs")
     end
 
-    def wait_for_notify
-      log("waiting for notify timeout=#{NOTIFY_TIMEOUT}")
-      connection.wait_for_notify(NOTIFY_TIMEOUT)
+    def drain_notify
+      until connection.notifies.nil?
+        log("draining notifications")
+      end
+    end
+
+    def wait_for_notify(t)
+      log("waiting for notify timeout=#{t}")
+      connection.wait_for_notify(t)
       log("done waiting for notify")
     end
 

data/lib/queue_classic/worker.rb

@@ -14,6 +14,9 @@ module QC
       @fork_worker = ENV["QC_FORK_WORKER"] == "true"
       log("worker fork=#{@fork_worker}")
 
+      @listening_worker = ENV["QC_LISTENING_WORKER"] == "true"
+      log("worker listen=#{@listening_worker}")
+
       handle_signals
     end
 
@@ -25,6 +28,10 @@ module QC
       @fork_worker
     end
 
+    def can_listen?
+      @listening_worker
+    end
+
     def handle_signals
       %W(INT TERM).each do |sig|
         trap(sig) do
@@ -88,8 +95,7 @@ module QC
           attempts += 1
           if attempts < MAX_LOCK_ATTEMPTS
             seconds = 2**attempts
-            log("worker sleeps seconds=#{seconds}")
-            sleep(seconds)
+            wait(seconds)
             log("worker tries again")
             next
           else
@@ -103,6 +109,20 @@ module QC
       job
     end
 
+    def wait(t)
+      if can_listen?
+        log("worker waiting on LISTEN")
+        @queue.database.listen
+        @queue.database.wait_for_notify(t) { log("message received") }
+        @queue.database.unlisten
+        @queue.database.drain_notify
+        log("worker finished LISTEN")
+      else
+        log("worker sleeps seconds=#{t}")
+        Kernel.sleep(t)
+      end
+    end
+
     #override this method to do whatever you want
     def handle_failure(job,e)
       puts "!"

data/test/database_test.rb

@@ -0,0 +1,28 @@
+require File.expand_path("../helper.rb", __FILE__)
+
+context "DatabaseTest" do
+
+  setup do
+    @database = init_db
+  end
+
+  teardown do
+    @database.disconnect
+  end
+
+  test "drain_notify clears all of the notifications" do
+    @database.listen
+    @database.execute("NOTIFY queue_classic_jobs, 'hello'")
+
+    assert ! @database.connection.notifies.nil?
+    assert   @database.connection.notifies.nil?
+
+    @database.execute("NOTIFY queue_classic_jobs, 'hello'")
+    @database.execute("NOTIFY queue_classic_jobs, 'hello'")
+    @database.execute("NOTIFY queue_classic_jobs, 'hello'")
+
+    @database.drain_notify
+    assert   @database.connection.notifies.nil?
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queue_classic
 version: !ruby/object:Gem::Version
-  version: 0.3.5.pre
+  version: 0.3.7.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2160828260 !ruby/object:Gem::Requirement
+  requirement: &2152255440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160828260
+  version_requirements: *2152255440
 description: Queue Classic (beta) is a queueing library for Ruby apps (Rails, Sinatra,
   Etc...) Queue Classic features asynchronous job polling, database maintained locks
   and no ridiculous dependencies. As a matter of fact, Queue Classic only requires
@@ -41,6 +41,7 @@ files:
 - lib/queue_classic/worker.rb
 - lib/queue_classic.rb
 - test/database_helpers.rb
+- test/database_test.rb
 - test/durable_array_test.rb
 - test/helper.rb
 - test/job_test.rb
@@ -74,6 +75,7 @@ summary: Queue Classic (beta) is a queueing library for Ruby apps (Rails, Sinatr
   and no ridiculous dependencies. As a matter of fact, Queue Classic only requires
   the pg and json.(simple)
 test_files:
+- test/database_test.rb
 - test/durable_array_test.rb
 - test/job_test.rb
 - test/queue_test.rb