jobba 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8bc9c17314ba74b80cf4c79c5d638f9d35b83b
-  data.tar.gz: e5f612733209502da66c0200cc924fb941d8f773
+  metadata.gz: 8b6fbe4f79c7707c269facfeb60eddd1af3f6983
+  data.tar.gz: 0d2910f8859ea8d05a1745a3cc58bbaf0ff34a2b
 SHA512:
-  metadata.gz: e185dfac6ec0e3d5d1daad73b62abc307dd8098251c1889f8427dbf1137970a9bb6e24ccdfda10eeacbd7ddd29648ee28cc7a7a8b1e4ced5b1c664208a307527
-  data.tar.gz: 259cd22746fb655039ca5e4b11c7095567c725ba03bb238445ef702ad24e07aa540eddab71613e21990508006050ddde68ec0173b6afc4cd32ecfdd3491ba541
+  metadata.gz: 6091608aa497bc8027fa30c23dbecf31c6d9d2e987177da8fed93cda20629ca35a26b3b806664a5e7983a45d4612ff5020857ab5752de11d66f059be81eadbb5
+  data.tar.gz: c81bb3aebf41dab11f2c94b37f6915d2ad4ead35586e78df8bea825427406ac128d531ea8c15a863258c2fefd70f24dbd5d00ae0d546a5e92b55a4f85ba34f6d

data/lib/jobba.rb

@@ -1,3 +1,4 @@
+require 'delegate'
 require 'forwardable'
 require 'securerandom'
 
@@ -10,6 +11,7 @@ require "jobba/time"
 require "jobba/utils"
 require "jobba/configuration"
 require "jobba/common"
+require "jobba/redis_with_expiration"
 require "jobba/state"
 require "jobba/status"
 require "jobba/statuses"
@@ -32,20 +34,14 @@ module Jobba
   end
 
   def self.redis
-    @redis ||= Redis::Namespace.new(
-      configuration.namespace,
-      redis: Redis.new(configuration.redis_options || {})
+    @redis ||= Jobba::RedisWithExpiration.new(
+      Redis::Namespace.new(
+        configuration.namespace,
+        redis: Redis.new(configuration.redis_options || {})
+      )
     )
   end
 
-  # Clears the whole shebang!  USE WITH CARE!
-  def self.clear_all_jobba_data!
-    keys = Jobba.redis.keys("*")
-    keys.each_slice(1000) do |some_keys|
-      Jobba.redis.del(*some_keys)
-    end
-  end
-
   def self.cleanup(seconds_ago: 60*60*24*30*12, batch_size: 1000)
     start_time = Jobba::Time.now
     delete_before = start_time - seconds_ago
@@ -59,6 +55,12 @@ module Jobba
       jobs_count += num_jobs
       break if jobs.size < batch_size
     end
+    jobs_count
+  end
+
+  # Clears the whole shebang!  USE WITH CARE!
+  def self.clear_all_jobba_data!
+    cleanup(seconds_ago: 0)
   end
 
 end

data/lib/jobba/redis_with_expiration.rb

@@ -0,0 +1,68 @@
+# This class provides Redis commands that automatically set key expiration.
+# The only commands modified are commands that:
+# 1. Take their (only) key as the first argument
+# AND
+# 2. Modify said key
+# AND
+# 3. Don't already set the key expiration by themselves
+class Jobba::RedisWithExpiration < SimpleDelegator
+  # 68.years in seconds
+  EXPIRES_IN = 2145916800
+
+  EXPIRE_METHODS = [
+    :append,
+    :decr,
+    :decrby,
+    :hdel,
+    :hincrby,
+    :hincrbyfloat,
+    :hmset,
+    :hset,
+    :hsetnx,
+    :incr,
+    :incrby,
+    :incrbyfloat,
+    :linsert,
+    :lpop,
+    :lpush,
+    :lpushx,
+    :lrem,
+    :lset,
+    :ltrim,
+    :mapped_hmset,
+    :migrate,
+    :move,
+    :pfadd,
+    :pfmerge,
+    :restore,
+    :rpop,
+    :rpush,
+    :rpushx,
+    :sadd,
+    :set,
+    :setbit,
+    :setnx,
+    :setrange,
+    :sinterstore,
+    :smove,
+    :spop,
+    :srem,
+    :sunionstore,
+    :zadd,
+    :zincrby,
+    :zinterstore,
+    :zrem,
+    :zremrangebyrank,
+    :zremrangebyscore,
+    :zunionstore
+  ]
+
+  EXPIRE_METHODS.each do |method|
+    define_method method do |key, *args|
+      result = super key, *args
+      # Only set expiration if the command (seems to have) succeeded
+      expire key, EXPIRES_IN if result
+      result
+    end
+  end
+end

data/lib/jobba/status.rb

@@ -246,12 +246,12 @@ module Jobba
 
         if attrs[:persist]
           redis.multi do
-            set({
+            set(
               id: id,
               progress: progress,
               errors: errors,
               attempt: attempt
-            })
+            )
             move_to_state!(state)
           end
         end

data/lib/jobba/version.rb

@@ -1,3 +1,3 @@
 module Jobba
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jobba
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -135,6 +135,7 @@ files:
 - lib/jobba/exceptions.rb
 - lib/jobba/id_clause.rb
 - lib/jobba/query.rb
+- lib/jobba/redis_with_expiration.rb
 - lib/jobba/state.rb
 - lib/jobba/status.rb
 - lib/jobba/statuses.rb