sidekiq-superworker 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a30dd0e4575bf141b1aa0c262df3d08fb21a7745
-  data.tar.gz: a6ca0500b339d3c5f75400c9efb58bfbacab5bfe
+  metadata.gz: ae27a81adaff0c4d2eb72b1f95dab8c5c25a7260
+  data.tar.gz: 187c3f3729c27a7ddfbc3019f94743e0893e9c59
 SHA512:
-  metadata.gz: 7bb2bc65a5e482cfec52dd8d23a1df3209bb9688d79449e573857076cc2442e5ef17a7769813b437cf4af3d42f4a6057f207b254b604ce16dbc2db41ceb19ecd
-  data.tar.gz: a2d9bff3ed22aa146080cb180acc007aaae88261af333b399cf56f8129d467cd9304e15d8449218949072ea69d542c573c749e6d783c259afa9572e97095f8cd
+  metadata.gz: d1702fea0b8f47b6ff3b69875c2be6130ca4fb0b03e371b57c3e56adcbb92d207e8cf23641df213ca6e57231ac28122bc773593fd7b688805ac1635849176b35
+  data.tar.gz: 866911be02c68203d7b73892d8ce3a13be9046be106fc56e76b968e249b7f83bc0a1efe11be1abc93d7355364752aeef60da6989efd613e7f7c51e6c973c7209

data/README.md

@@ -136,6 +136,15 @@ When a superjob is queued, records for all of its subjobs are created. By defaul
 Sidekiq::Superworker.options[:delete_subjobs_after_superjob_completes] = false
 ```
 
+#### Superjob expiration
+
+When a subjob dies due to too many retries, the jobs that depend on it will never run and the superjob will never be completed. Consequently, the subjob Redis keys will never be removed. You can set `superjob_expiration` to *N* to make the subjobs keys expire in *N* seconds. The default value is `nil` (the keys will never expire).
+
+```ruby
+# config/initializers/superworker.rb
+Sidekiq::Superworker.options[:superjob_expiration] = 2592000 # 1 Month
+```
+
 ### Logging
 
 To make debugging easier, Sidekiq Superworker provides detailed log messages when its logger is set to the DEBUG level:

data/lib/sidekiq/superworker.rb

@@ -9,7 +9,8 @@ module Sidekiq
   module Superworker
     DEFAULTS = {
       delete_subjobs_after_superjob_completes: true,
-      subjob_redis_prefix: 'subjob'
+      subjob_redis_prefix: 'subjob',
+      superjob_expiration: nil
     }
 
     def self.options

data/lib/sidekiq/superworker/subjob.rb

@@ -74,7 +74,7 @@ module Sidekiq
           result = nil
           Sidekiq.redis do |conn|
             conn.multi do
-              result = yield
+              result = yield(conn)
             end
           end
           result
@@ -102,8 +102,10 @@ module Sidekiq
 
       def save
         return false unless self.valid?
-        Sidekiq.redis do |conn|
+
+        self.class.transaction do |conn|
           conn.mapped_hmset(key, to_param)
+          conn.expire(key,Superworker.options[:superjob_expiration]) if Superworker.options[:superjob_expiration]
         end
         true
       end
@@ -140,12 +142,12 @@ module Sidekiq
 
       def children
         return [] if children_ids.blank?
-        children = children_ids.collect { |id| self.class.find_by_jid(self.class.jid(superjob_id,id)) }
+        children = children_ids.collect { |id| self.class.find_by_jid(self.class.jid(superjob_id, id)) }
         children.reject(&:nil?)
       end
 
       def next
-        self.class.find_by_jid(self.class.jid(superjob_id,next_id))
+        self.class.find_by_jid(self.class.jid(superjob_id, next_id))
       end
 
       def ==(other)

data/lib/sidekiq/superworker/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Superworker
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-superworker
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq