sidekiq-superworker 0.0.2 → 0.0.3

data/lib/sidekiq/superworker.rb

@@ -20,3 +20,4 @@ Sidekiq.configure_server do |config|
 end
 
 Superworker = Sidekiq::Superworker::Worker unless Object.const_defined?('Superworker')
+Sidekiq::Monitor::Cleaner.add_ignored_queue(Sidekiq::Superworker::SuperjobProcessor.queue_name) if defined?(Sidekiq::Monitor)

data/lib/sidekiq/superworker/processor.rb

@@ -17,20 +17,7 @@ module Sidekiq
         raise "Job has nil jid: #{item}" if item['jid'].nil?
 
         subjob = find_subjob_by_jid(item['jid'])
-        if defined?(Sidekiq::Monitor)
-          job = Sidekiq::Monitor::Job.where(queue: :superworker, jid: subjob.superjob_id).first
-          if job
-            result = {
-              message: "#{exception.message} (thrown in #{worker.class}, JID: #{item['jid']})",
-              backtrace: exception.backtrace
-            }
-            job.update_attributes(
-              finished_at: DateTime.now,
-              status: 'failed',
-              result: result
-            )
-          end
-        end
+        SuperjobProcessor.error(subjob.superjob_id, worker, item, exception)
       end
 
       protected

data/lib/sidekiq/superworker/subjob_processor.rb

@@ -94,16 +94,7 @@ module Sidekiq
             descendants_are_complete(parent)
           # Otherwise, this is the final subjob of the superjob
           else
-            # Set the superjob Sidekiq::Monitor::Job as being complete
-            if defined?(Sidekiq::Monitor)
-              job = Sidekiq::Monitor::Job.where(queue: :superworker, jid: subjob.superjob_id).first
-              if job
-                job.update_attributes(
-                  status: 'complete',
-                  finished_at: Time.now
-                )
-              end
-            end
+            SuperjobProcessor.complete(subjob.superjob_id)
           end
         end
       end

data/lib/sidekiq/superworker/superjob_processor.rb

@@ -0,0 +1,59 @@
+module Sidekiq
+  module Superworker
+    class SuperjobProcessor
+      def self.queue_name
+        :superworker
+      end
+
+      def self.create(superjob_id, superworker_class_name, args, subjobs)
+        # If sidekiq_monitor is being used, create a Sidekiq::Monitor::Job for the superjob
+        if defined?(Sidekiq::Monitor)
+          now = Time.now
+          Sidekiq::Monitor::Job.create(
+            jid: superjob_id,
+            queue: queue_name,
+            class_name: superworker_class_name,
+            args: args,
+            enqueued_at: now,
+            started_at: now,
+            status: 'running'
+          )
+        end
+
+        # Enqueue the first root-level subjob
+        first_subjob = subjobs.select{ |subjob| subjob.parent_id.nil? }.first
+        SubjobProcessor.enqueue(first_subjob)
+      end
+
+      def self.complete(superjob_id)
+        # Set the superjob Sidekiq::Monitor::Job as being complete
+        if defined?(Sidekiq::Monitor)
+          job = Sidekiq::Monitor::Job.where(queue: queue_name, jid: superjob_id).first
+          if job
+            job.update_attributes(
+              status: 'complete',
+              finished_at: Time.now
+            )
+          end
+        end
+      end
+
+      def self.error(superjob_id, worker, item, exception)
+        if defined?(Sidekiq::Monitor)
+          job = Sidekiq::Monitor::Job.where(queue: queue_name, jid: superjob_id).first
+          if job
+            result = {
+              message: "#{exception.message} (thrown in #{worker.class}, JID: #{item['jid']})",
+              backtrace: exception.backtrace
+            }
+            job.update_attributes(
+              finished_at: DateTime.now,
+              status: 'failed',
+              result: result
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/sidekiq/superworker/worker.rb

@@ -26,24 +26,7 @@ module Sidekiq
             def perform_async(*arg_values)
               @args = Hash[@arg_keys.zip(arg_values)]
               subjobs = create_subjobs
-
-              # Create a Sidekiq::Monitor::Job for the superjob
-              if defined?(Sidekiq::Monitor)
-                now = Time.now
-                Sidekiq::Monitor::Job.create(
-                  args: arg_values,
-                  class_name: @class_name,
-                  enqueued_at: now,
-                  jid: @superjob_id,
-                  queue: :superworker,
-                  started_at: now,
-                  status: 'running'
-                )
-              end
-
-              # Enqueue the first root-level subjob
-              first_subjob = subjobs.select{ |subjob| subjob.parent_id.nil? }.first
-              SubjobProcessor.enqueue(first_subjob)
+              SuperjobProcessor.create(@superjob_id, @class_name, arg_values, subjobs)
             end
 
             protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -106,6 +106,7 @@ files:
 - lib/sidekiq/superworker/processor.rb
 - lib/sidekiq/superworker/server/middleware.rb
 - lib/sidekiq/superworker/subjob_processor.rb
+- lib/sidekiq/superworker/superjob_processor.rb
 - lib/sidekiq/superworker/version.rb
 - lib/sidekiq/superworker/worker.rb
 - lib/sidekiq/superworker.rb