queue_classic 0.3.2 → 0.3.3.pre

data/lib/queue_classic.rb

@@ -11,6 +11,8 @@ require 'queue_classic/queue'
 require 'queue_classic/job'
 
 module QC
+  VERBOSE = ENV["VERBOSE"] == true
+
   def self.method_missing(sym, *args, &block)
     Queue.send(sym, *args, &block)
   end

data/lib/queue_classic/database.rb

@@ -2,8 +2,10 @@ module QC
   class Database
     @@connection = nil
 
-    MAX_TOP_BOUND = 9
-    DEFAULT_QUEUE_NAME = "queue_classic_jobs"
+    DATABASE_URL        = (ENV["QC_DATABASE_URL"] || ENV["DATABASE_URL"])
+    MAX_TOP_BOUND       = (ENV["QC_TOP_BOUND"] || 9).to_i
+    NOTIFY_TIMEOUT      = (ENV["QC_NOTIFY_TIMEOUT"] || 10).to_i
+    DEFAULT_QUEUE_NAME  = "queue_classic_jobs"
 
     def self.create_queue(name)
       db = new(name)
@@ -15,9 +17,9 @@ module QC
     attr_reader :table_name
 
     def initialize(queue_name=nil)
-      @top_boundry = ENV["TOP_BOUND"] || MAX_TOP_BOUND
+      @top_boundry = MAX_TOP_BOUND
       @table_name = queue_name || DEFAULT_QUEUE_NAME
-      @db_params = URI.parse(ENV["DATABASE_URL"])
+      @db_params = URI.parse(DATABASE_URL)
     end
 
     def init_db
@@ -26,6 +28,18 @@ module QC
       load_functions
     end
 
+    def listen
+      execute("LISTEN queue_classic_jobs")
+    end
+
+    def unlisten
+      execute("UNLISTEN queue_classic_jobs")
+    end
+
+    def wait_for_notify
+      connection.wait_for_notify(NOTIFY_TIMEOUT)
+    end
+
     def waiting_conns
       execute("SELECT * FROM pg_stat_activity WHERE datname = '#{@name}' AND waiting = 't' AND application_name = 'queue_classic'")
     end
@@ -58,9 +72,8 @@ module QC
           @db_params.user,
           @db_params.password
         )
-        @@connection.exec("LISTEN queue_classic_jobs")
         @@connection.exec("SET application_name = 'queue_classic'")
-        silence_warnings unless ENV["LOGGING_ENABLED"]
+        silence_warnings unless VERBOSE
       end
       @@connection
     end

data/lib/queue_classic/durable_array.rb

@@ -8,7 +8,6 @@ module QC
 
     def <<(details)
       execute("INSERT INTO #{@table_name} (details) VALUES ('#{details.to_json}')")
-      execute("NOTIFY queue_classic_jobs, 'new-job'")
     end
 
     def count
@@ -28,17 +27,8 @@ module QC
       find_many { "SELECT * FROM #{@table_name} WHERE details LIKE '%#{q}%'" }
     end
 
-    def lock_head
-      find_one { "SELECT * FROM lock_head('#{@table_name}')" }
-    end
-
     def first
-      if job = lock_head
-        job
-      else
-        @database.connection.wait_for_notify(1) {|e,p,msg| job = lock_head if msg == "new-job" }
-        job
-      end
+      find_one { "SELECT * FROM lock_head('#{@table_name}')" }
     end
 
     def each

data/lib/queue_classic/worker.rb

@@ -1,9 +1,12 @@
 module QC
   class Worker
 
+    MAX_LOCK_ATTEMPTS = (ENV["QC_MAX_LOCK_ATTEMPTS"] || 5).to_i
+
     def initialize
-      @running = true
-      @queue = QC::Queue.new(ENV["QUEUE"])
+      @running     = true
+      @queue       = QC::Queue.new(ENV["QUEUE"])
+      @fork_worker = ENV["QC_FORK_WORKER"] == "true"
       handle_signals
     end
 
@@ -11,8 +14,12 @@ module QC
       @running
     end
 
+    def fork_worker?
+      @fork_worker
+    end
+
     def handle_signals
-      %W(INT TRAP).each do |sig|
+      %W(INT TERM).each do |sig|
         trap(sig) do
           if running?
             @running = false
@@ -24,13 +31,22 @@ module QC
     end
 
     def start
-      while running? do
-        work
+      while running?
+        if fork_worker?
+          fork_and_work
+        else
+          work
+        end
       end
     end
 
+    def fork_and_work
+      @cpid = fork { work }
+      Process.wait(@cpid)
+    end
+
     def work
-      if job = @queue.dequeue #blocks until we have a job
+      if job = lock_job
         begin
           job.work
         rescue Object => e
@@ -39,6 +55,27 @@ module QC
           @queue.delete(job)
         end
       end
+      job = nil
+      GC.start
+    end
+
+    def lock_job
+      attempts = 0
+      job = nil
+      until job
+        job = @queue.dequeue
+        if job.nil?
+          attempts += 1
+          if attempts < MAX_LOCK_ATTEMPTS
+            sleep(2**attempts)
+            next
+          else
+            break
+          end
+        else
+        end
+      end
+      job
     end
 
     #override this method to do whatever you want

data/test/queue_test.rb

@@ -53,6 +53,7 @@ context "Queue" do
     QC::Queue.length
     QC::Queue.enqueue "Klass.method"
     QC::Queue.delete QC::Queue.dequeue
+    QC::Queue.enqueue "Klass.method"
     QC::Queue.dequeue
     assert_equal 1, QC.connection_status[:total]
   end

metadata

@@ -1,49 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: queue_classic
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.2
+version: !ruby/object:Gem::Version
+  version: 0.3.3.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Ryan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-03 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pg
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153629240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.10.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153629240
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2153628740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-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 the pg and json.
+  prerelease: false
+  version_requirements: *2153628740
+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
+  the pg and json.
 email: ryan@heroku.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - readme.md
 - lib/queue_classic/database.rb
 - lib/queue_classic/durable_array.rb
@@ -58,35 +56,34 @@ files:
 - test/job_test.rb
 - test/queue_test.rb
 - test/worker_test.rb
-has_rdoc: true
 homepage: http://github.com/ryandotsmith/queue_classic
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
-summary: 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 the pg and json.(simple)
-test_files: 
+summary: 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
+  the pg and json.(simple)
+test_files:
 - test/durable_array_test.rb
 - test/job_test.rb
 - test/queue_test.rb