inst-jobs 3.0.12 → 3.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee779fa187d057bce265940ca1c9c2944bdf096ab198060e0819ff40dd02358b
-  data.tar.gz: bc930f9dc0ca659df54388753dc9aa26402c866023b7f275155897ccca35ebf4
+  metadata.gz: c1369efb0e72de3f01f922b7f77a95a6c5dd1979aaec11cfd76cdc4507202428
+  data.tar.gz: 244a543711c3ceab301f4ea0f30bb238e47330921059ec27133a7a2de44389f7
 SHA512:
-  metadata.gz: bd24bd19e153cb7f48b33911e38fbd9657de396baad1c32286d5a4acb899d23f9d97c627914c095647006129f5c0ebc008e7e07b311f3d33b89819e400cce756
-  data.tar.gz: 005e7e0a637b1e5a3fcae2b7e22edfb2af604da2328e273f512b4747dacb4d723afc06bd4846246c3fc541f72ca7068123c98bf26b52e2964f7eaa45dba6b609
+  metadata.gz: '09ce7c560febe39082502641d62e9309f515d026eb95d840e3645fbb2725d9eb6c70f2b147402a44d462bc5761c8f4727739e87a7f4a6acbed391868ae024d2e'
+  data.tar.gz: d0332dc2e652adf67b93f61122d535a7e48f20d48e9d66a08d2e5fc75d08c4be1c7e15b4656c7f1bfc4102a389bd23d256b4d43cb88b914e98ce9a0ea67ddd3c

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.0.13"
 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,7 +269,7 @@ 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
 

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
 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-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord