sidekiq-superworker 0.0.1 → 0.0.2

data/lib/sidekiq/superworker/processor.rb

@@ -13,18 +13,44 @@ module Sidekiq
         end
       end
 
+      def error(worker, item, queue, exception)
+        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
+      end
+
       protected
 
       def complete_item(item)
         raise "Job has nil jid: #{item}" if item['jid'].nil?
+
+        subjob = find_subjob_by_jid(item['jid'])
+        SubjobProcessor.complete(subjob) if subjob
+      end
+
+      def find_subjob_by_jid(jid)
         # The job may complete before the Subjob record is created; in case that happens,
         # we need to sleep briefly and requery.
         tries = 3
-        while !(subjob = Subjob.find_by_jid(item['jid'])) && tries > 0
+        while !(subjob = Subjob.find_by_jid(jid)) && tries > 0
           sleep 1
           tries -= 1
         end
-        SubjobProcessor.complete(subjob) if subjob
+        subjob
       end
     end
   end

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

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

data/lib/sidekiq/superworker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq