inst-jobs 0.15.19 → 1.0.0

data/lib/delayed/plugin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 
 module Delayed

data/lib/delayed/pool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 class Pool
   include Delayed::Logging

data/lib/delayed/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sinatra/base'
 require 'sinatra/json'
 require 'json'

data/lib/delayed/server/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Server
     module Helpers

data/lib/delayed/settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'erb'
 require 'active_support/core_ext/hash/indifferent_access'
@@ -23,7 +25,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 +70,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/testing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module Testing
   def self.run_job(job)

data/lib/delayed/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
-  VERSION = "0.15.19"
+  VERSION = "1.0.0"
 end

data/lib/delayed/work_queue/in_process.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 # The simplest possible implementation of a WorkQueue -- just turns around and

data/lib/delayed/work_queue/parent_process.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'socket'
 require 'timeout'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 class ParentProcess

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 module WorkQueue
 class ParentProcess
@@ -5,7 +7,7 @@ class ParentProcess
     attr_reader :clients, :listen_socket
 
     include Delayed::Logging
-    SIGNALS = %i{INT TERM QUIT CHLD}
+    SIGNALS = %i{INT TERM QUIT}
 
     def initialize(listen_socket, parent_pid: nil, config: Settings.parent_process)
       @listen_socket = listen_socket

data/lib/delayed/worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
 
 class TimeoutError < RuntimeError; end
@@ -253,7 +255,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/lib/delayed/worker/consul_health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'health_check'
 require_relative 'process_helper'
 require 'socket'

data/lib/delayed/worker/health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     class HealthCheck

data/lib/delayed/worker/null_health_check.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     class NullHealthCheck < HealthCheck

data/lib/delayed/worker/process_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   class Worker
     module ProcessHelper

data/lib/delayed/yaml_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # New definitions for YAML to aid in serialization and deserialization of delayed jobs.
 
 require 'yaml'

data/lib/delayed_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Delayed
   MIN_PRIORITY = 0
   HIGH_PRIORITY = 0

data/lib/inst-jobs.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'delayed_job'

data/spec/active_record_job_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path("../spec_helper", __FILE__)
 
 describe 'Delayed::Backed::ActiveRecord::Job' do
@@ -17,7 +19,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
 
   it "should recover as well as possible from a failure failing a job" do
     allow(Delayed::Job::Failed).to receive(:create).and_raise(RuntimeError)
-    job = "test".send_later_enqueue_args :reverse, no_delay: true
+    job = "test".delay(ignore_transaction: true).reverse
     job_id = job.id
     proc { job.fail! }.should raise_error(RuntimeError)
     proc { Delayed::Job.find(job_id) }.should raise_error(ActiveRecord::RecordNotFound)
@@ -43,7 +45,7 @@ describe 'Delayed::Backed::ActiveRecord::Job' do
     it "should select the next job at random if enabled" do
       begin
         Delayed::Settings.select_random_from_batch = true
-        15.times { "test".send_later :length }
+        15.times { "test".delay.length }
         founds = []
         15.times do
           job = Delayed::Job.get_and_lock_next_available('tester')

data/spec/delayed/cli_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::CLI do

data/spec/delayed/daemon_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Daemon do

data/spec/delayed/server_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'delayed/server'
 

data/spec/delayed/settings_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Settings do

data/spec/delayed/work_queue/in_process_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::InProcess do

data/spec/delayed/work_queue/parent_process/client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Client do

data/spec/delayed/work_queue/parent_process/server_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::WorkQueue::ParentProcess::Server do

data/spec/delayed/work_queue/parent_process_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fileutils'
 

data/spec/delayed/worker/consul_health_check_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'imperium'
 

data/spec/delayed/worker/health_check_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Delayed::Worker::HealthCheck do

data/spec/delayed/worker_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../spec_helper"
 
 describe Delayed::Worker do
@@ -38,6 +40,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).

data/spec/gemfiles/51.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.15.18)
+    inst-jobs (1.0.0)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       after_transaction_commit (>= 1.0, < 3)
@@ -52,7 +52,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    after_transaction_commit (2.0.0)
+    after_transaction_commit (2.1.0)
       activerecord (>= 5.0)
     arel (8.0.0)
     backports (3.11.3)
@@ -67,9 +67,9 @@ GEM
     erubi (1.7.1)
     et-orbi (1.2.4)
       tzinfo
-    fugit (1.3.4)
+    fugit (1.3.9)
       et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.1)
+      raabro (~> 1.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     httpclient (2.8.3)
@@ -97,7 +97,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.3)
-    raabro (1.1.6)
+    raabro (1.4.0)
     rack (2.0.5)
     rack-protection (2.0.0.beta2)
       rack
@@ -127,7 +127,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.3.1)
-    redis (4.1.3)
+    redis (4.2.2)
     redis-scripting (1.0.1)
       redis (>= 3.0)
     rspec (3.8.0)
@@ -195,4 +195,4 @@ DEPENDENCIES
   wwtd (~> 1.4.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/spec/gemfiles/52.gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.15.12)
+    inst-jobs (1.0.0)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       after_transaction_commit (>= 1.0, < 3)
+      fugit (~> 1.3)
       railties (>= 4.2)
       redis (> 3.0)
       redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.4, < 3.5)
 
 GEM
   remote: https://rubygems.org/
@@ -54,9 +54,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    after_transaction_commit (2.0.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    after_transaction_commit (2.1.0)
       activerecord (>= 5.0)
     arel (9.0.0)
     backports (3.15.0)
@@ -69,14 +69,17 @@ GEM
     database_cleaner (1.6.1)
     diff-lcs (1.3)
     erubi (1.8.0)
-    et-orbi (1.2.1)
+    et-orbi (1.2.4)
       tzinfo
+    fugit (1.3.9)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     httpclient (2.8.3)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    imperium (0.5.1)
+    imperium (0.5.2)
       addressable (~> 2.5)
       httpclient (~> 2.8)
     loofah (2.2.3)
@@ -100,7 +103,8 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.1.1)
+    public_suffix (4.0.6)
+    raabro (1.4.0)
     rack (2.0.7)
     rack-protection (2.0.0.beta2)
       rack
@@ -131,7 +135,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (12.3.3)
-    redis (4.1.2)
+    redis (4.2.2)
     redis-scripting (1.0.1)
       redis (>= 3.0)
     rspec (3.8.0)
@@ -147,8 +151,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rufus-scheduler (3.4.2)
-      et-orbi (~> 1.0)
     sinatra (2.0.0.beta2)
       mustermann (= 1.0.0.beta2)
       rack (~> 2.0)
@@ -178,7 +180,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    wwtd (1.3.0)
+    wwtd (1.4.1)
 
 PLATFORMS
   ruby
@@ -187,7 +189,7 @@ DEPENDENCIES
   bump
   byebug
   database_cleaner (= 1.6.1)
-  imperium (>= 0.2.3)
+  imperium (>= 0.5.2)
   inst-jobs!
   pg (< 1.0)
   pry
@@ -198,7 +200,7 @@ DEPENDENCIES
   sinatra (= 2.0.0.beta2)
   sinatra-contrib (= 2.0.0.beta2)
   timecop (= 0.7.1)
-  wwtd (~> 1.3.0)
+  wwtd (~> 1.4.0)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3