activejob-lockable 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 00d85e35a9333dc6aff62522868ca06ae5b232da
-  data.tar.gz: 2e37ff7e727e2b1e52b1bddfeb109a986db42318
+SHA256:
+  metadata.gz: 664f6c1cc3b4fcaa153c34c1a3dd734c66a45dbbcfa751d79c23a24f2e5bcc58
+  data.tar.gz: e1a97f5959d30c1357d77a2fe628e63a367215c08ee1c6e3bf57b33eb1faf4cd
 SHA512:
-  metadata.gz: b7867247ae9ee03903cb36cf9f91c0b18d892808457d16ccfc214be3189c7190d98ae841a37c8f8b2bc547760d08f6f757654ff5f5889105704dc19dec82ffa1
-  data.tar.gz: 680c8b7980c7bc5c6651a0ca924551638a8277aa6a4e226c36cf79ce2c8641ae606d694c90b1a6f478edb5224806a16847d247ec957c8a3c3d3878159fb2fbdc
+  metadata.gz: 45c4f6b76f35093fbf81926898794ccac7444b8aef051b16e7b6113956f65ef02a0fae3b3d1d8282758a226de4a6a712ddae4e3c426d5e6a488ffefb4e07955f
+  data.tar.gz: 5343ddb76f4e63fe321604d2f73df42d98d89d030922489878db6b6e6c9af5e30d7dc1f0e5a650679e05e46b2f453e0a8ad2cbb73bc95561472efc601ba4a077

data/lib/activejob/lockable.rb

@@ -30,8 +30,7 @@ module ActiveJob
       end
     end
 
-    # Returns the current Redis connection. If none has been created, will
-    # create a new one.
+    # Returns the current Redis connection, raising an error if it hasn't been created
     def redis
       return @redis if @redis
       raise 'Redis is not configured'

data/lib/activejob/lockable/lockable.rb

@@ -17,7 +17,7 @@ module ActiveJob
       def enqueue(options = {})
         @options = options
         if locked?
-          logger.info "job is locked, expires in #{locked_ttl} second"
+          logger.info "Job is locked, expires in #{locked_ttl} second(s)"
           send(on_locked_action) if on_locked_action && respond_to?(on_locked_action)
         else
           lock!
@@ -27,18 +27,25 @@ module ActiveJob
 
       def lock!
         return if lock_period.to_i <= 0
-        logger.info "locked with #{lock_key} for #{lock_period} seconds. Job_id: #{self.job_id} class_name: #{self.class}"
+        logger.info "Acquiring lock #{lock_extra_info}"
         begin
-          ActiveJob::Lockable::RedisStore.setex(lock_key, lock_period, self.job_id)
-        rescue => e
-          logger.info "EXCEPTION: locked with #{lock_key} for #{lock_period} seconds. Job_id: #{self.job_id} class_name: #{self.class}"
-          raise e
+          # `:ex => Fixnum`: Set the specified expire time, in seconds.
+          # `:nx => true`: Only set the key if it does not already exist.
+          lock_acquired = ActiveJob::Lockable::RedisStore.set(
+            lock_key,
+            self.job_id,
+            { ex: lock_period.to_i, nx: true }
+          )
+          raise "Could not acquire lock #{lock_extra_info}" unless lock_acquired
+        rescue StandardError => e
+          logger.info "EXCEPTION acquiring lock #{lock_extra_info}"
+          raise
         end
       end
 
       def unlock!
         return unless locked?
-        logger.info "unlocked with #{lock_key}. Job_id: #{self.job_id} class_name: #{self.class}"
+        logger.info "Releasing lock #{lock_extra_info}"
         ActiveJob::Lockable::RedisStore.del(lock_key)
       end
 
@@ -58,7 +65,13 @@ module ActiveJob
       private
 
       def lock_period
-        options[:lock]
+        return 0 unless options
+
+        options[:lock].to_i
+      end
+
+      def lock_extra_info
+        "[key #{lock_key}] [seconds #{lock_period.to_i}] [job_id #{self.job_id}] [class_name: #{self.class}]"
       end
     end
   end

data/lib/activejob/lockable/redis_store.rb

@@ -2,8 +2,8 @@ module ActiveJob
   module Lockable
     class RedisStore
       class << self
-        def setex(cache_key, expiration, cache_value)
-          ActiveJob::Lockable.redis.setex(cache_key, expiration, cache_value)
+        def set(cache_key, cache_value, options = {})
+          ActiveJob::Lockable.redis.set(cache_key, cache_value, options)
         end
 
         def exists?(cache_key)

data/lib/activejob/lockable/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module Lockable
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-lockable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dmytro Zakharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -148,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Prevents jobs from enqueuing with unique arguments for a certain period of