inst-jobs 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282216250dfa2cf11cfa998ec9e8ce24762e7ddc20ff3e13c22b96a8668f4467
-  data.tar.gz: a10e92b7516307691b30049f33be79b4a550e97b7382e594111b936f0dba993f
+  metadata.gz: 66e746a245b7b6285d8be89085060e790b35b1890f886bce7ccd8fe69aba6123
+  data.tar.gz: 2e537eab47f0c65a4670f3a5230274d20068687a968739d88f01eb5cfb1b0037
 SHA512:
-  metadata.gz: 4048809794dc713e8bcfda0f747f0a5a1f0ae5e394a553a549ed9aadffeb98357fbf0050ef2d2e7e7cd858afa3bf0b6003121f4802245f2c6a361f4ca05923e6
-  data.tar.gz: f03c66624ecbaaf575787ef197377d0d0d57c1e0be878ec76570c2f6f9f54ecc119f5da5c6228ea141bea89bf323b607ad47e6c989327e2a570dd97b0a004291
+  metadata.gz: daae66931ebd4d17f2c578f2a85ee793fad01cdf048ae43332c5884b2596d800d250c503ca4431d036cc4ff95edd7b885394c8a7745a46ea6861260e1437b98c
+  data.tar.gz: 787c0db4e6dc7e14188dfbe3be2b9603275e89a50372ca93b49d302573cf6cec2e67ff9982e472107dc6b4510d7d631686781839e3f60433c1088d9dfcaec52d

data/lib/delayed/backend/active_record.rb

@@ -23,6 +23,7 @@ module Delayed
       # Contains the work object as a YAML field.
       class Job < AbstractJob
         include Delayed::Backend::Base
+
         self.table_name = :delayed_jobs
 
         attr_accessor :enqueue_result
@@ -633,6 +634,7 @@ module Delayed
 
         class Failed < Job
           include Delayed::Backend::Base
+
           self.table_name = :failed_jobs
 
           def self.cleanup_old_jobs(before_date, batch_size: 10_000)
@@ -654,6 +656,7 @@ module Delayed
               end
               self.requeued_job_id = job.id
               save!
+              logger.info("Requeued #{Delayed::Logging.log_job(job, :long)}")
               JobTracking.job_created(job)
               job
             end

data/lib/delayed/backend/base.rb

@@ -31,7 +31,7 @@ module Delayed
         # :priority, :run_at, :queue, :strand, :singleton
         # Example: Delayed::Job.enqueue(object, priority: 0, run_at: time, queue: queue)
         def enqueue(object,
-                    priority: default_priority,
+                    priority: nil,
                     run_at: nil,
                     expires_at: nil,
                     queue: Delayed::Settings.queue,
@@ -44,6 +44,7 @@ module Delayed
             raise ArgumentError, "Cannot enqueue items which do not respond to perform"
           end
 
+          priority ||= default_priority
           strand ||= singleton if Settings.infer_strand_from_singleton
 
           kwargs = Settings.default_job_options.merge(kwargs)
@@ -112,7 +113,12 @@ module Delayed
             end
           end
 
-          JobTracking.job_created(job)
+          if job.id
+            logger.info("Created #{Delayed::Logging.log_job(job, :long)}")
+            JobTracking.job_created(job)
+          else
+            logger.info("Dropped #{Delayed::Logging.log_job(job, :long)}")
+          end
 
           job
         end
@@ -204,7 +210,7 @@ module Delayed
 
               unless pid
                 job_pid = $1.to_i
-                running = Process.kill(0, job_pid) rescue false
+                running = Delayed::Util.process_running?(job_pid)
               end
 
               if running

data/lib/delayed/daemon.rb

@@ -12,8 +12,8 @@ module Delayed
     end
 
     def status(print: true, pid: self.pid)
-      alive = pid && (Process.kill(0, pid) rescue false) && :running
-      alive ||= :draining if pid && Process.kill(0, -pid) rescue false
+      alive = pid && Delayed::Util.process_running?(pid) && :running
+      alive ||= :draining if pid && Delayed::Util.process_running?(-pid)
       if alive
         puts "Delayed jobs #{alive}, pool PID: #{pid}" if print
       elsif print && print != :alive

data/lib/delayed/logging.rb

@@ -24,6 +24,18 @@ module Delayed
                 end
     end
 
+    def self.log_job(job, format = :short)
+      id_format = job.id ? " (id=#{job.id})" : ""
+
+      case format
+      when :long
+        "#{job.full_name}#{id_format} #{Settings.job_detailed_log_format.call(job)}"
+      else
+        "#{job.full_name}#{id_format} #{Settings.job_short_log_format.call(job)}".strip
+      end
+    end
+
+    delegate :log_job, to: :"Delayed::Logging"
     delegate :logger, to: :"Delayed::Logging"
 
     def say(message, level = :debug)

data/lib/delayed/util.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Delayed
+  module Util
+    def self.process_running?(pid)
+      Process.kill(0, pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
+  end
+end

data/lib/delayed/version.rb

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

data/lib/delayed/work_queue/parent_process/server.rb

@@ -9,6 +9,7 @@ module Delayed
         attr_reader :clients, :listen_socket
 
         include Delayed::Logging
+
         SIGNALS = %i[INT TERM QUIT].freeze
 
         def initialize(listen_socket, parent_pid: nil, config: Settings.parent_process)

data/lib/delayed/worker/null_health_check.rb

@@ -5,11 +5,11 @@ module Delayed
     class NullHealthCheck < HealthCheck
       self.type_name = :none
 
-      def start
+      def start # rubocop:disable Naming/PredicateMethod
         true
       end
 
-      def stop
+      def stop # rubocop:disable Naming/PredicateMethod
         true
       end
 

data/lib/delayed/worker.rb

@@ -20,6 +20,7 @@ module Delayed
 
   class Worker
     include Delayed::Logging
+
     SIGNALS = %i[INT TERM QUIT].freeze
 
     attr_reader :config, :queue_name, :min_priority, :max_priority, :work_queue
@@ -223,7 +224,7 @@ module Delayed
             end
             job.destroy
           end
-          logger.info("Completed #{log_job(job, :short)} #{format("%.0fms", (runtime * 1000))}")
+          logger.info("Completed #{log_job(job, :short)} #{format("%.0fms", runtime * 1000)}")
         end
       rescue ::Delayed::RetriableError => e
         can_retry = job.attempts + 1 < job.inferred_max_attempts
@@ -272,15 +273,6 @@ module Delayed
       Process.pid
     end
 
-    def log_job(job, format = :short)
-      case format
-      when :long
-        "#{job.full_name} #{Settings.job_detailed_log_format.call(job)}"
-      else
-        "#{job.full_name} #{Settings.job_short_log_format.call(job)}".strip
-      end
-    end
-
     # set up the session context information, so that it gets logged with the job log lines
     # also set up a unique tmpdir, which will get removed at the end of the job.
     def configure_for_job(job)

data/lib/delayed_job.rb

@@ -40,6 +40,7 @@ require "delayed/periodic"
 require "delayed/plugin"
 require "delayed/pool"
 require "delayed/worker"
+require "delayed/util"
 
 require "delayed/worker/health_check"
 require "delayed/worker/consul_health_check"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-22 00:00:00.000000000 Z
+date: 2025-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,258 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: bump
-  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: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: debug
-  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: diplomat
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.3
-- !ruby/object:Gem::Dependency
-  name: mutex_m
-  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: pg
-  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: rack-test
-  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
-    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: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-inst
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  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: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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'
 description:
 email:
 - cody@instructure.com
@@ -444,6 +192,7 @@ files:
 - lib/delayed/server/views/layout.erb
 - lib/delayed/settings.rb
 - lib/delayed/testing.rb
+- lib/delayed/util.rb
 - lib/delayed/version.rb
 - lib/delayed/work_queue/in_process.rb
 - lib/delayed/work_queue/parent_process.rb