inst-jobs 0.15.21 → 0.15.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8bab4958615bf7295c579533cfb1353e1581b8b4309ea18f266d738b8eb2a0f
-  data.tar.gz: 0b1f7c4864954f603dc3f0f49d8d07ad8019dc86a4ddf51842fd6c26043c40da
+  metadata.gz: 33b7f135ba67d0b2b056851cec2e95672ac03766fa48d614ef53fa0e25a04255
+  data.tar.gz: 29878f6688d376811085f7615c701ae2f7cf31cc3bf6462440823f4e91ccb271
 SHA512:
-  metadata.gz: fb55981330a060dce72fa0b5f82028ed9e1a2f647228c957826b9fbad34a0243bdebf6ae69b844e7b589693cda06180033e2218916a20fad21366274b5c1fa89
-  data.tar.gz: d0c1ee9ecf0b1371a4adafac9cff748a58afd53dfa0eb7986dec50858e2419c55a47811cb072599cb6dece55f2d17b067e00a88bae4df2bec607f168ef38927d
+  metadata.gz: 8695ff4bd7e9c10a5b1a393adc56d0be6cb1b45c668a8ba413bf91a59a8b1eb76633f0f8e3429ff15c6a0f03a9404e3e4f0d3bacd6f2cbd0ef3984ac5b0e0ad7
+  data.tar.gz: 63f911fce5ddf75e7565095c134ffa0a3808fc5bf2b8e86f62466092b32a127afa449cbb44007774c771838fd30222a957246cbb44e9b8b125b01c2a7e8f2fe0

data/lib/delayed/settings.rb

@@ -23,7 +23,10 @@ module Delayed
       :worker_health_check_config,
       :worker_procname_prefix,
     ]
-    SETTINGS_WITH_ARGS = [ :num_strands ]
+    SETTINGS_WITH_ARGS = [
+      :job_detailed_log_format,
+      :num_strands
+    ]
 
     SETTINGS.each do |setting|
       mattr_writer(setting)
@@ -65,6 +68,7 @@ module Delayed
 
     self.num_strands = ->(strand_name){ nil }
     self.default_job_options = ->{ Hash.new }
+    self.job_detailed_log_format = ->(job){ job.to_json(include_root: false, only: %w(tag strand priority attempts created_at max_attempts source)) }
 
     # Send workers KILL after QUIT if they haven't exited within the
     # slow_exit_timeout

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.15.21"
+  VERSION = "0.15.22"
 end

data/lib/delayed/worker.rb

@@ -253,7 +253,7 @@ class Worker
   def log_job(job, format = :short)
     case format
     when :long
-      "#{job.full_name} #{ job.to_json(:include_root => false, :only => %w(tag strand priority attempts created_at max_attempts source)) }"
+      "#{job.full_name} #{ Settings.job_detailed_log_format.call(job) }"
     else
       job.full_name
     end

data/spec/delayed/worker_spec.rb

@@ -38,6 +38,33 @@ describe Delayed::Worker do
     end
   end
 
+  describe "#log_job" do
+    around(:each) do |block|
+      prev_logger = Delayed::Settings.job_detailed_log_format
+      block.call
+      Delayed::Settings.job_detailed_log_format = prev_logger
+    end
+
+    it "has a reasonable default format" do
+      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")
+      long_format = subject.log_job(job, :long)
+      expect(long_format).to eq("RSpec::Mocks::Double {\"priority\":25,\"attempts\":0,\"created_at\":null,\"tag\":\"RSpec::Mocks::Double#perform\",\"max_attempts\":null,\"strand\":\"test_jobs\",\"source\":null}")
+    end
+
+    it "logging format can be changed with settings" do
+      Delayed::Settings.job_detailed_log_format = ->(job){ "override format #{job.strand}"}
+      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")
+      long_format = subject.log_job(job, :long)
+      expect(long_format).to eq("RSpec::Mocks::Double override format test_jobs")
+    end
+  end
+
   describe "#run" do
     it "passes extra config options through to the WorkQueue" do
       expect(subject.work_queue).to receive(:get_and_lock_next_available).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.21
+  version: 0.15.22
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord