inst-jobs 3.1.13 → 3.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2342458023c7d56e82311cd05089b8a748c266b462289a5ce5ba9c169a89abbe
-  data.tar.gz: b9cf5ced42b4a1d18f3599203c55683218c94d71c9f5671db58c8c49ba502ef6
+  metadata.gz: 61efa120190f5afebc7aa06c5d78f3b746307bcee1986c814cc317056e916361
+  data.tar.gz: 8fe59b557d2847a2def469bf46d1d01230fbfc02ccebe7c8604d53352aebf819
 SHA512:
-  metadata.gz: 5b234730e2acb907a880e564b8e7036ff64e9b3d09c18426779c125e7f7c2dbc83629d1c11157131137b0902a128f1a3cfba968e611a77e82782adabfdca6d96
-  data.tar.gz: d3487c737f65ced442c1219ae929eefd1247bb5753f345d06991634262fa592671ea37c798044b0477f038b2e2958c083bc38b9c5b4d344e9a557ec450cfb400
+  metadata.gz: eae3cc53632c5064023a345cde20acdfa69a86156f19f001f881dc19a0843cf546d2676b9cff2158e2344f5fbd6c867be214c47ae89679c7412144630ba08160
+  data.tar.gz: 49a1d5a7f56f0f344add67add41e21c524ca0688402708910f9fd04c13336d69d7623d05e22588f4407e805c8f67ee87519aeb8304f92191510f64ed72975308

data/lib/delayed/backend/active_record.rb

@@ -25,6 +25,8 @@ module Delayed
         include Delayed::Backend::Base
         self.table_name = :delayed_jobs
 
+        attr_accessor :enqueue_result
+
         scope :next_in_strand_order, -> { order(:strand_order_override, :id) }
 
         def self.reconnect!
@@ -106,7 +108,8 @@ module Delayed
           end
 
           # https://www.postgresql.org/docs/9.5/libpq-exec.html
-          sql << " RETURNING id"
+          # https://stackoverflow.com/questions/39058213/differentiate-inserted-and-updated-rows-in-upsert-using-system-columns
+          sql << " RETURNING id, (xmax = 0) AS inserted"
 
           if lock_and_insert
             # > Multiple queries sent in a single PQexec call are processed in a single transaction,
@@ -120,12 +123,22 @@ module Delayed
             end
             result = connection.execute(sql, "#{self.class} Create")
             self.id = result.values.first&.first
+            inserted = result.values.first&.second
             result.clear
           else
             result = connection.exec_query(sql, "#{self.class} Create", binds)
             self.id = connection.send(:last_inserted_id, result)
+            inserted = result.rows.first&.second
           end
 
+          self.enqueue_result = if id.present? && inserted
+                                  :inserted
+                                elsif id.present? && !inserted
+                                  :updated
+                                else
+                                  :dropped
+                                end
+
           # it might not get set if there was an existing record, and we didn't update it
           if id
             @new_record = false

data/lib/delayed/log_tailer.rb

@@ -3,7 +3,12 @@
 module Delayed
   class LogTailer
     def run
-      if Rails.logger.respond_to?(:log_path)
+      if Rails.logger.respond_to?(:broadcast_to)
+        return if ActiveSupport::Logger.logger_outputs_to?(Rails.logger, $stdout)
+
+        Rails.logger.broadcast_to(ActiveSupport::Logger.new($stdout))
+        return
+      elsif Rails.logger.respond_to?(:log_path)
         log_path = Rails.logger.log_path
       elsif Rails.logger.instance_variable_get(:@logdev).try(:instance_variable_get, "@dev").try(:path)
         log_path = Rails.logger.instance_variable_get(:@logdev).instance_variable_get(:@dev).path

data/lib/delayed/message_sending.rb

@@ -94,7 +94,7 @@ module Delayed
     def __calculate_sender_for_delay
       # enforce public send in dev and test, but not prod (since it uses
       # debug APIs, it's expensive)
-      return sender(1) if ::Rails.env.test? || ::Rails.env.development?
+      sender(1) if ::Rails.env.test? || ::Rails.env.development?
     end
 
     module ClassMethods

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.13"
+  VERSION = "3.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.13
+  version: 3.1.15
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,20 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -242,20 +228,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -372,16 +344,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement