skiplock 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c119463794e6ac523fb385c7925181bf069d6cf37996fe4a2dacf101e6faa6c8
-  data.tar.gz: 0aee11414e05623185781b1a5779a9b7393474fde176ec6d9ee42151cd5453a4
+  metadata.gz: 20d942af62acf618cbb7d7baeaf3d2f0404aac8cf012c255c8806ddbe5d23fd9
+  data.tar.gz: 7383cfaf4f4a15b0cb9fe8a55bca896b72bcb3c728684aa4e60cc876be67d97e
 SHA512:
-  metadata.gz: 8ba80ed8e0bd4bf185ffa2e65f88d7f6a1f32e1124e75e82dac50ba1fecc12167687ffab2e5f8f9e7148ba24c000ae6114c04c67e175793c99a45db17dde8b0c
-  data.tar.gz: 0adb1907dd1e0c8338c298d32f6fe3e576f755a38962beed186c56ca4375882cbbf20646a7efd2cf37145588d7acf6dd4855156f418de9732254ec5b86704e9a
+  metadata.gz: 487fc69ce0ff35ed020c2c0d0823303743d86afd1acd9a18d2399602afcb34f15e1f8215a10f65fafdcf10f9a3982fe8c76cb2df3043dff5ee6562f2379dfd03
+  data.tar.gz: e71774849db02070c6690d76818f22d693dc7531d3e9ca09710a8768359bdda857edf734f0f86d386e03098d1c66991aae6c7d4b91c2398b7135dc9dc4f25980

data/lib/skiplock/job.rb

@@ -27,9 +27,9 @@ module Skiplock
       timestamp = Time.at(timestamp) if timestamp
       if Thread.current[:skiplock_job].try(:id) == activejob.job_id
         Thread.current[:skiplock_job].activejob_error = options[:error]
-        Thread.current[:skiplock_job].data['activejob_error'] = true
         Thread.current[:skiplock_job].executions = activejob.executions
         Thread.current[:skiplock_job].exception_executions = activejob.exception_executions
+        Thread.current[:skiplock_job].exception_executions['activejob_error'] = true
         Thread.current[:skiplock_job].scheduled_at = timestamp
         Thread.current[:skiplock_job]
       else
@@ -65,8 +65,8 @@ module Skiplock
       self.worker_id = nil
       self.updated_at = Time.now > self.updated_at ? Time.now : self.updated_at + 1 # in case of clock drifting
       if self.exception
-        self.exception_executions["[#{self.exception.class.name}]"] = self.exception_executions["[#{self.exception.class.name}]"].to_i + 1 unless self.data.key?('activejob_error')
-        if (self.executions.to_i >= self.max_retries + 1) || self.data.key?('activejob_error') || self.exception.is_a?(Skiplock::Extension::ProxyError)
+        self.exception_executions["[#{self.exception.class.name}]"] = self.exception_executions["[#{self.exception.class.name}]"].to_i + 1 unless self.exception_executions.key?('activejob_error')
+        if (self.executions.to_i >= self.max_retries + 1) || self.exception_executions.key?('activejob_error') || self.exception.is_a?(Skiplock::Extension::ProxyError)
           self.expired_at = Time.now
         else
           self.scheduled_at = Time.now + (5 * 2**self.executions.to_i)
@@ -116,7 +116,7 @@ module Skiplock
       self.max_retries = (self.data['options'].key?('max_retries') ? self.data['options']['max_retries'].to_i : max_retries) rescue max_retries
       self.max_retries = 20 if self.max_retries < 0 || self.max_retries > 20
       self.purge = (self.data['options'].key?('purge') ? self.data['options']['purge'] : purge_completion) rescue purge_completion
-      job_data = self.attributes.slice('job_class', 'queue_name', 'locale', 'timezone', 'priority', 'executions', 'exception_executions').merge('job_id' => self.id, 'enqueued_at' => self.updated_at, 'arguments' => (self.data['arguments'] || []))
+      job_data = { 'job_class' => self.job_class, 'queue_name' => self.queue_name, 'locale' => self.locale, 'timezone' => self.timezone, 'priority' => self.priority, 'executions' => self.executions, 'exception_executions' => self.exception_executions.dup, 'job_id' => self.id, 'enqueued_at' => self.updated_at, 'arguments' => (self.data['arguments'] || []) }
       self.executions = self.executions.to_i + 1
       Thread.current[:skiplock_job] = self
       start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -149,4 +149,4 @@ module Skiplock
       self.dispose
     end
   end
-end
+end

data/lib/skiplock/version.rb

@@ -1,4 +1,4 @@
 module Skiplock
-  VERSION = Version = '1.1.1'
+  VERSION = Version = '1.1.3'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skiplock
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Tin Vo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob