sidekiq-superworker 0.0.6 → 0.0.7

data/lib/sidekiq/superworker.rb

@@ -29,13 +29,29 @@ end
 
 Superworker = Sidekiq::Superworker::Worker unless Object.const_defined?('Superworker')
 
-# If sidekiq_monitor is being used, customize how superjobs are monitored
 if defined?(Sidekiq::Monitor)
+
   # Make Cleaner ignore superjobs, as they don't exist in Redis and thus won't be synced with Sidekiq::Monitor::Job
   Sidekiq::Monitor::Cleaner.add_ignored_queue(Sidekiq::Superworker::SuperjobProcessor.queue_name) if defined?(Sidekiq::Monitor)
 
   # Add a custom view that shows the subjobs for a superjob
-  Sidekiq::Monitor::CustomViews.add 'Subjobs', "#{directory}/../../app/views/sidekiq/superworker/subjobs" do |job|
+  custom_views_directory = "#{directory}/../../app/views/sidekiq/superworker/subjobs"
+  Sidekiq::Monitor::CustomViews.add 'Subjobs', custom_views_directory do |job|
     job.queue == Sidekiq::Superworker::SuperjobProcessor.queue_name.to_s
   end
+
+  # Add a "superjob:{id}" search filter
+  Sidekiq::Monitor::JobsDatatable.add_search_filter({
+    pattern: /^superjob:([\d]+)$/,
+    filter: lambda do |search_term, records|
+      superjob_id = search_term[/^superjob:([\d]+)$/, 1]
+      superjob = Sidekiq::Monitor::Job.find_by_id(superjob_id)
+      # Return empty set
+      return records.where(id: nil) unless superjob
+      superjob_jid = superjob.jid
+      subjob_jids = Sidekiq::Superworker::Subjob.where(superjob_id: superjob_jid).map(&:jid).compact
+      records.where(jid: subjob_jids + [superjob_jid])
+    end
+  })
+
 end

data/lib/sidekiq/superworker/processor.rb

@@ -19,7 +19,7 @@ module Sidekiq
 
         Superworker.debug "JID ##{item['jid']}: Error thrown"
         subjob = find_subjob_by_jid(item['jid'])
-        SuperjobProcessor.error(subjob.superjob_id, worker, item, exception) if subjob
+        SubjobProcessor.error(subjob, worker, item, exception) if subjob
       end
 
       protected

data/lib/sidekiq/superworker/server/middleware.rb

@@ -8,12 +8,13 @@ module Sidekiq
 
         def call(worker, item, queue)
           begin
-            yield
+            return_value = yield
           rescue Exception => exception
             @processor.error(worker, item, queue, exception)
             raise exception
           end
           @processor.complete(item)
+          return_value
         end
       end
     end

data/lib/sidekiq/superworker/subjob_processor.rb

@@ -82,6 +82,12 @@ module Sidekiq
         end
       end
 
+      def self.error(subjob, worker, item, exception)
+        Superworker.debug "#{subjob.to_info}: Error"
+        subjob.update_attribute(:status, 'failed')
+        SuperjobProcessor.error(subjob.superjob_id, worker, item, exception)
+      end
+
       def self.descendants_are_complete(subjob)
         Superworker.debug "#{subjob.to_info}: Descendants are complete"
         subjob.update_attribute(:descendants_are_complete, true)

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '0.0.6'
+    VERSION = '0.0.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq