resque_empty_queue 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/resque/plugins/empty_queue_job.rb

@@ -0,0 +1,54 @@
+module Resque
+  module Plugins
+    class EmptyQueueFailureDetectedError < RuntimeError;
+    end
+
+    module EmptyQueueJob
+      def queue
+        :empty_queue
+      end
+
+      def wait_for_empty_queue(queue_name)
+        @queue_name = queue_name
+      end
+
+      def queue_name
+        return @queue_name
+      end
+
+      def before_perform_empty_queue_job(*args)
+        if !failure_queue_empty?
+          # should this re-enqueue itself or simply continue to retry
+          raise EmptyQueueFailureDetectedError.new("Failure detected in queue: #{queue_name}. Retry after jobs placed in queue.")
+        end
+
+        if !job_queue_empty? || !working_queue_empty?
+          # try again later
+          Resque.enqueue_in(5, self, *args)
+          raise Resque::Job::DontPerform
+        end
+      end
+
+      private
+
+      def job_queue_empty?
+        return Resque.size(queue_name) == 0
+      end
+
+      def working_queue_empty?
+        return Resque::Worker.all.all? { |worker| worker.job['queue'] != queue_name.to_s }
+      end
+
+      def failure_queue_empty?
+        i = 0
+        page_size = 100
+        while !(failures = Resque::Failure.all(i, i + page_size)).empty?
+          return false unless failures.all? { |failure| failure.nil? || failure['retried_at'] || failure['queue'] != queue_name.to_s }
+          i = i + page_size
+        end
+
+        return true
+      end
+    end
+  end
+end

data/lib/resque_empty_queue.rb

@@ -1,6 +1,5 @@
-require 'resque_scheduler'
+require 'resque'
+# Causes problems when included with Sinatra?? when loading workers rake task
+# require 'resque_scheduler'
 
-require "resque/resque"
-require "resque/empty_queue"
-require "resque/empty_queue_job"
-require "resque/empty_queue_retry_job"
+require "resque/plugins/empty_queue_job"

data/resque_empty_queue.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'resque_empty_queue'
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ['Michael G. Pearce', 'J. A. Wheeler']
@@ -24,10 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/resque_empty_queue.rb",
-     "lib/resque/resque.rb",
-     "lib/resque/empty_queue.rb",
-     "lib/resque/empty_queue_job.rb",
-     "lib/resque/empty_queue_retry_job.rb",
+     "lib/resque/plugins/empty_queue_job.rb",
      "resque_empty_queue.gemspec",
      "test/resque/resque_test.rb",
      "test/test_helper.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque_empty_queue
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael G. Pearce
@@ -96,10 +96,7 @@ files:
 - Rakefile
 - VERSION
 - lib/resque_empty_queue.rb
-- lib/resque/resque.rb
-- lib/resque/empty_queue.rb
-- lib/resque/empty_queue_job.rb
-- lib/resque/empty_queue_retry_job.rb
+- lib/resque/plugins/empty_queue_job.rb
 - resque_empty_queue.gemspec
 - test/resque/resque_test.rb
 - test/test_helper.rb

data/lib/resque/empty_queue.rb

@@ -1,5 +0,0 @@
-require 'resque'
- 
-module Resque
-end
-

data/lib/resque/empty_queue_job.rb

@@ -1,11 +0,0 @@
-module Resque
-  class EmptyQueueJob
-    def self.wait_for_empty_queue(queue_name)
-      @queue_name = queue_name
-    end
-
-    def self.queue_name
-      return @queue_name
-    end
-  end
-end

data/lib/resque/empty_queue_retry_job.rb

@@ -1,19 +0,0 @@
-module Resque
-  class EmptyQueueRetryJob
-    @queue = :resque_empty_queue
-
-    def self.perform(empty_queue_job_class_name, *args)
-      klass = eval(empty_queue_job_class_name)
-      if queue_is_empty?(klass)
-        Resque.enqueue(klass, *args)
-      else
-        # TODO: use resque-scheduler to enqueue in the future
-        Resque.enqueue_in(5, self, klass.name, *args)
-      end
-    end
-
-    def self.queue_is_empty?(klass)
-      return Resque.size(klass.queue_name) == 0
-    end
-  end
-end

data/lib/resque/resque.rb

@@ -1,36 +0,0 @@
-require "resque/empty_queue"
-
-module Resque
-  extend self
-
-  # Raised when trying to create a job that does not yet have an empty associated job queue
-  class EmptyQueueError < RuntimeError;
-  end
-
-  def enqueue_with_empty_queue(klass, *args)
-    if !empty_queue_job?(klass) || should_execute_empty_queue_job?(klass, *args)
-      enqueue_without_empty_queue(klass, *args)
-    else
-      # queue not empty
-      enqueue_without_empty_queue(EmptyQueueRetryJob, klass.name, *args)
-    end
-  end
-
-  alias_method :enqueue_without_empty_queue, :enqueue
-  alias_method :enqueue, :enqueue_with_empty_queue
-
-  private
-
-  def should_execute_empty_queue_job?(klass, *args)
-    return true if queue_is_empty?(klass)
-    return false
-  end
-
-  def queue_is_empty?(klass)
-    return Resque.size(klass.queue_name) == 0
-  end
-
-  def empty_queue_job?(klass)
-    klass.ancestors.include?(Resque::EmptyQueueJob)
-  end
-end