inst-jobs 3.0.12 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee779fa187d057bce265940ca1c9c2944bdf096ab198060e0819ff40dd02358b
-  data.tar.gz: bc930f9dc0ca659df54388753dc9aa26402c866023b7f275155897ccca35ebf4
+  metadata.gz: 0ea5fb9db3338718560d2107fd348ca95077e2b1f98490d33a8f61ecf686d7dd
+  data.tar.gz: 17ae33dac196625a7d194c51b609f1c7e98b6ce8917898b2a03b283b9784c96c
 SHA512:
-  metadata.gz: bd24bd19e153cb7f48b33911e38fbd9657de396baad1c32286d5a4acb899d23f9d97c627914c095647006129f5c0ebc008e7e07b311f3d33b89819e400cce756
-  data.tar.gz: 005e7e0a637b1e5a3fcae2b7e22edfb2af604da2328e273f512b4747dacb4d723afc06bd4846246c3fc541f72ca7068123c98bf26b52e2964f7eaa45dba6b609
+  metadata.gz: 20ad04cef57908281160729d47e4e9ae0a86b2c75c7200cdb0467c23b69dd32d634b1f6c886cda42209d1a2f794acf2461f0b69f82f4fe8571a999c93b35f277
+  data.tar.gz: 874f268caddfa09f160dd3eb05fa7d9be3d04fb667e23da32d6cce5901d6e45321e203db83830ad4d40986119656453b9e63f3da65f654f302150a4c95286fb6

data/lib/delayed/backend/base.rb

@@ -86,8 +86,12 @@ module Delayed
             kwargs.merge!(n_strand_options(full_strand_name, num_strands))
           end
 
+          job = nil
+
           if singleton
-            job = create(**kwargs)
+            Delayed::Worker.lifecycle.run_callbacks(:create, kwargs) do
+              job = create(**kwargs)
+            end
           elsif batches && strand.nil? && run_at.nil?
             batch_enqueue_args = kwargs.slice(*self.batch_enqueue_args)
             batches[batch_enqueue_args] << kwargs
@@ -95,7 +99,9 @@ module Delayed
           else
             raise ArgumentError, "on_conflict can only be provided with singleton" if kwargs[:on_conflict]
 
-            job = create(**kwargs)
+            Delayed::Worker.lifecycle.run_callbacks(:create, kwargs) do
+              job = create(**kwargs)
+            end
           end
 
           JobTracking.job_created(job)

data/lib/delayed/lifecycle.rb

@@ -5,6 +5,7 @@ module Delayed
 
   class Lifecycle
     EVENTS = {
+      create: [:args],
       error: %i[worker job exception],
       exceptional_exit: %i[worker exception],
       execute: [:worker],
@@ -76,7 +77,7 @@ module Delayed
     def execute(*args, &block)
       @before.each { |c| c.call(*args) }
       result = @around.call(*args, &block)
-      @after.each { |c| c.call(*args) }
+      @after.each { |c| c.call(*args, result: result) }
       result
     end
 

data/lib/delayed/server.rb

@@ -16,7 +16,7 @@ module Delayed
       # Rails will take care of establishing the DB connection for us if there is
       # an application present
       if using_active_record? && !ActiveRecord::Base.connected?
-        ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+        ActiveRecord::Base.establish_connection(ENV.fetch("DATABASE_URL", nil))
       end
 
       @allow_update = args.length.positive? && args[0][:update]

data/lib/delayed/settings.rb

@@ -33,6 +33,7 @@ module Delayed
 
     SETTINGS_WITH_ARGS = %i[
       job_detailed_log_format
+      job_short_log_format
       num_strands
     ].freeze
 
@@ -137,6 +138,7 @@ module Delayed
     self.job_detailed_log_format = lambda { |job|
       job.to_json(include_root: false, only: %w[tag strand singleton priority attempts created_at max_attempts source])
     }
+    self.job_short_log_format = ->(_job) { "" }
 
     # Send workers KILL after QUIT if they haven't exited within the
     # slow_exit_timeout

data/lib/delayed/version.rb

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

data/lib/delayed/worker.rb

@@ -220,7 +220,7 @@ module Delayed
             end
             job.destroy
           end
-          logger.info("Completed #{log_job(job)} #{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
@@ -269,14 +269,14 @@ module Delayed
       when :long
         "#{job.full_name} #{Settings.job_detailed_log_format.call(job)}"
       else
-        job.full_name
+        "#{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)
-      previous_tmpdir = ENV["TMPDIR"]
+      previous_tmpdir = ENV.fetch("TMPDIR", nil)
 
       self.class.running_job(job) do
         dir = Dir.mktmpdir("job-#{job.id}-#{name.gsub(/[^\w.]/, '.')}-")

data/spec/delayed/worker_spec.rb

@@ -85,13 +85,14 @@ describe Delayed::Worker do
     end
 
     it "logging format can be changed with settings" do
-      Delayed::Settings.job_detailed_log_format = ->(job) { "override format #{job.strand}" }
+      Delayed::Settings.job_detailed_log_format = ->(job) { "override format detailed #{job.strand}" }
+      Delayed::Settings.job_short_log_format = ->(_job) { "override format short" }
       payload = double(perform: nil)
       job = Delayed::Job.new(payload_object: payload, priority: 25, strand: "test_jobs")
       short_log_format = subject.log_job(job, :short)
-      expect(short_log_format).to eq("RSpec::Mocks::Double")
+      expect(short_log_format).to eq("RSpec::Mocks::Double override format short")
       long_format = subject.log_job(job, :long)
-      expect(long_format).to eq("RSpec::Mocks::Double override format test_jobs")
+      expect(long_format).to eq("RSpec::Mocks::Double override format detailed test_jobs")
     end
   end
 

data/spec/shared/shared_backend.rb

@@ -35,6 +35,23 @@ shared_examples_for "a backend" do
     expect(Delayed::Job.jobs_count(:current)).to eq(1)
   end
 
+  it "triggers the lifecycle event around the create" do
+    called = false
+    created_job = nil
+
+    Delayed::Worker.lifecycle.after(:create) do |_, result:|
+      called = true
+      created_job = result
+    end
+
+    job = SimpleJob.new
+    Delayed::Job.enqueue(job)
+
+    expect(called).to be_truthy
+    expect(created_job).to be_kind_of Delayed::Job
+    expect(created_job.tag).to eq "SimpleJob#perform"
+  end
+
   it "is able to set priority when enqueuing items" do
     @job = Delayed::Job.enqueue SimpleJob.new, priority: 5
     expect(@job.priority).to eq(5)

data/spec/spec_helper.rb

@@ -47,14 +47,14 @@ RSpec::Core::ExampleGroup.include(NoYamlDump)
 
 ENV["TEST_ENV_NUMBER"] ||= "1"
 ENV["TEST_DB_HOST"] ||= "localhost"
-ENV["TEST_DB_DATABASE"] ||= "inst-jobs-test-#{ENV['TEST_ENV_NUMBER']}"
+ENV["TEST_DB_DATABASE"] ||= "inst-jobs-test-#{ENV.fetch('TEST_ENV_NUMBER', nil)}"
 
 connection_config = {
   adapter: :postgresql,
   host: ENV["TEST_DB_HOST"].presence,
   encoding: "utf8",
-  username: ENV["TEST_DB_USERNAME"],
-  database: ENV["TEST_DB_DATABASE"],
+  username: ENV.fetch("TEST_DB_USERNAME", nil),
+  database: ENV.fetch("TEST_DB_DATABASE", nil),
   min_messages: "notice",
   # Ensure the pool is big enough the deadlock tests don't get starved for connections by rails instead
   pool: 20

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.1.1
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord