inst-jobs 0.15.19 → 0.15.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988fd063fdecd8a94025cf8b9d1db853e3397ab3842942928cbdc99e241d0d80
-  data.tar.gz: c20258789ad05909efe3125e70a34bceb2a124398e43dbdf7d4b3c3d6dadf8ab
+  metadata.gz: 17a98186a4f5f1038958a84bfc19884179c91d2afc5ec92f6e61967ab76dceb0
+  data.tar.gz: bfacc6d2201f5a5e7741f793b8042cb5c32434254ec82dcf76003e3dae539c2d
 SHA512:
-  metadata.gz: e5f688d3413484f51c93270aea753178915ed38cdd3081dba5816621b070a99cea9c5bd518757db43ced1607a651241f8cd62f5160f5ea53cf113a7df3cab8c7
-  data.tar.gz: fb563b85cc6b7caaef52e63342f00ce06ad0d30c75a3adaa47b7f8e81565a77610e4c3fc7aea7b3af1c703ea9e5f5e80c8801cf7ec4dc0cd10569cae57ebfcde
+  metadata.gz: 18bbbbc13154cd9dc95a26f2fe3e3c3cc30759740c049c85e65b5de1ed4e2dd28130685f86b50139889fd493785ad513dd55f1023cb845f8cb98bbdf866b55c3
+  data.tar.gz: 3d7cf731a725967f7b99066c7a330f266450541782e5aef0962d6832a8a0eda56119b36ffe9bb4dc3e22c0be02fafc8383366763dfe6425cfc392bbeade1e28e

data/lib/delayed/backend/active_record.rb

@@ -377,7 +377,9 @@ module Delayed
         def self.transaction_for_singleton(strand, on_conflict)
           return yield if on_conflict == :loose
           self.transaction do
-            connection.execute(sanitize_sql(["SELECT pg_advisory_xact_lock(#{connection.quote_table_name('half_md5_as_bigint')}(?))", strand]))
+            function = on_conflict == :patient ? 'pg_try_advisory_xact_lock' : 'pg_advisory_xact_lock'
+            result = connection.select_value(sanitize_sql(["SELECT #{function}(#{connection.quote_table_name('half_md5_as_bigint')}(?))", strand]))
+            return if result == false && on_conflict == :patient
             yield
           end
         end
@@ -396,7 +398,7 @@ module Delayed
               new_job.initialize_defaults
               job.run_at =
                 case on_conflict
-                when :use_earliest
+                when :use_earliest, :patient
                   [job.run_at, new_job.run_at].min
                 when :overwrite
                   new_job.run_at

data/lib/delayed/periodic.rb

@@ -47,7 +47,10 @@ class Periodic
   end
 
   def enqueue
-    Delayed::Job.enqueue(self, @job_args.merge(:max_attempts => 1, :run_at => @cron.next_time(Delayed::Periodic.now).utc.to_time, :singleton => tag))
+    Delayed::Job.enqueue(self, @job_args.merge(:max_attempts => 1,
+                                               :run_at => @cron.next_time(Delayed::Periodic.now).utc.to_time,
+                                               :singleton => tag,
+                                               on_conflict: :patient))
   end
 
   def perform

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.15.19"
+  VERSION = "0.15.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.19
+  version: 0.15.20
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord