activejob-lockable 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 664f6c1cc3b4fcaa153c34c1a3dd734c66a45dbbcfa751d79c23a24f2e5bcc58
-  data.tar.gz: e1a97f5959d30c1357d77a2fe628e63a367215c08ee1c6e3bf57b33eb1faf4cd
+  metadata.gz: e7030403a0857ccb1c8c520af5f8aa65dae5c62436d3b2ee6aba9e98b5150200
+  data.tar.gz: a2e9f0462fadb5601d318b702b9fb242cbe6f5ced1eb93a2004ed9d8e98ffd91
 SHA512:
-  metadata.gz: 45c4f6b76f35093fbf81926898794ccac7444b8aef051b16e7b6113956f65ef02a0fae3b3d1d8282758a226de4a6a712ddae4e3c426d5e6a488ffefb4e07955f
-  data.tar.gz: 5343ddb76f4e63fe321604d2f73df42d98d89d030922489878db6b6e6c9af5e30d7dc1f0e5a650679e05e46b2f453e0a8ad2cbb73bc95561472efc601ba4a077
+  metadata.gz: 182ce05c231b63b810e8d37d7ee9886f0552e461650d2f776bb56a7cd5f00cafe5ba0b1d969af72b4e18fedf783f9ef4042caf25f483437ae9db35c76ef8d48f
+  data.tar.gz: e6234683928e34b0c38172138ddaa95c9bc14510ad10b20b3d1c500a0c200824bc7653d3f53e09e9f826c2bd32cb8cf684e3323abec6d68fc88e585779a55601

data/lib/activejob/lockable/lockable.rb

@@ -16,31 +16,25 @@ module ActiveJob
 
       def enqueue(options = {})
         @options = options
-        if locked?
-          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!
-          super(options)
-        end
+        return trigger_on_locked_action unless lock!
+
+        super(options)
       end
 
       def lock!
-        return if lock_period.to_i <= 0
+        return true if lock_period.to_i <= 0
         logger.info "Acquiring lock #{lock_extra_info}"
-        begin
-          # `: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
+        # `:ex => Fixnum`: Set the specified expire time, in seconds.
+        # `:nx => true`: Only set the key if it does not already exist.
+        # Returns boolean, lock acquired or not
+        ActiveJob::Lockable::RedisStore.set(
+          lock_key,
+          self.job_id,
+          { ex: lock_period.to_i, nx: true }
+        )
+      rescue StandardError => e
+        logger.info "EXCEPTION acquiring lock #{lock_extra_info}"
+        raise
       end
 
       def unlock!
@@ -70,6 +64,11 @@ module ActiveJob
         options[:lock].to_i
       end
 
+      def trigger_on_locked_action
+        logger.info "Job is locked, expires in #{locked_ttl} second(s)"
+        public_send(on_locked_action) if on_locked_action && respond_to?(on_locked_action)
+      end
+
       def lock_extra_info
         "[key #{lock_key}] [seconds #{lock_period.to_i}] [job_id #{self.job_id}] [class_name: #{self.class}]"
       end

data/lib/activejob/lockable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-lockable
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmytro Zakharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob