inst-jobs 0.13.7 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527f11441928b3b0441c6472b38acf010b753efd
-  data.tar.gz: 3b267f6baafad78f71d62100689fefa5b9d836b9
+  metadata.gz: ee8d7326e878b8571d349ec95ae6b6b8870c8ca9
+  data.tar.gz: 43c64c727119ba15d95a0a7f2e39c102068c1cce
 SHA512:
-  metadata.gz: dbd8d1cfeaada7d63f0fedd65473a83697bee6e585c5b796fb8864925c1afde5c297f8fdee02c38a507d6752acfcffe20b7de82ef85d916cb0096af52cff14cc
-  data.tar.gz: eb5a1c4dc8c4cd96cbac3158fda68d19f5db202c54c49a71670d68e9ff1dc1396d7e5a050d713abc656e439377e9f53f78a69da353fbeb7c099729ee527b4652
+  metadata.gz: b9e12899372899fe7ae9ee0c2e692cbad12244f22f3507279ce7c4f9426f876bb058ef632c53c8c1b70d6c010bb9a7b63c441b6733b8fdfca77d2246ef358381
+  data.tar.gz: 4e77f257047f61b065e0505994974d718a4f6a98b3ef956a640dc825f2eee3a6a07d24d10a0e0be017fce9aa034a630809b550460254d94a7eac2c7819306a51

data/lib/delayed/daemon.rb

@@ -56,15 +56,7 @@ class Daemon
     alive = status(pid: pid, print: false)
     if alive == :running || (kill && alive == :draining)
       puts "Stopping pool #{pid}..."
-      signal = 'INT'
-      if kill
-        pid = -pid # send to the whole group
-        if kill == 9
-          signal = 'KILL'
-        else
-          signal = 'TERM'
-        end
-      end
+      signal = kill ? 'TERM' : 'QUIT'
       begin
         Process.kill(signal, pid)
       rescue Errno::ESRCH

data/lib/delayed/logging.rb

@@ -28,5 +28,9 @@ module Delayed
     def logger
       Delayed::Logging.logger
     end
+
+    def say(message, level = :debug)
+      logger.send(level, message)
+    end
   end
 end

data/lib/delayed/pool.rb

@@ -1,8 +1,13 @@
 module Delayed
 class Pool
+  include Delayed::Logging
+
   mattr_accessor :on_fork
   self.on_fork = ->{ }
 
+  SIGNALS = %i{INT TERM QUIT}
+  POOL_SLEEP_PERIOD = 5
+
   attr_reader :workers
 
   def initialize(*args)
@@ -12,6 +17,8 @@ class Pool
       warn "Calling Delayed::Pool.new directly is deprecated. Use `Delayed::CLI.new.run()` instead."
     end
     @workers = {}
+    @signal_queue = []
+    @self_pipe = IO.pipe
   end
 
   def run
@@ -21,6 +28,7 @@ class Pool
 
   def start
     say "Started job master", :info
+    SIGNALS.each { |sig| trap(sig) { @signal_queue << sig; wake_up } }
     $0 = procname
     # fork to handle unlocking (to prevent polluting the parent with worker objects)
     unlock_pid = fork_with_reconnects do
@@ -33,8 +41,8 @@ class Pool
     say "Workers spawned"
     join
     say "Shutting down"
-  rescue Interrupt => e
-    say "Signal received, exiting", :info
+    stop
+    reap_all_children
   rescue Exception => e
     say "Job master died with error: #{e.inspect}\n#{e.backtrace.join("\n")}", :fatal
     raise
@@ -46,14 +54,6 @@ class Pool
     "delayed_jobs_pool#{Settings.pool_procname_suffix}"
   end
 
-  def say(msg, level = :debug)
-    if defined?(Rails.logger) && Rails.logger
-      Rails.logger.send(level, "[#{Process.pid}]P #{msg}")
-    else
-      puts(msg)
-    end
-  end
-
   def unlock_orphaned_jobs(worker = nil, pid = nil)
     return if Settings.disable_automatic_orphan_unlocking
 
@@ -136,26 +136,102 @@ class Pool
 
   def join
     loop do
-      child = Process.wait
-      if workers.include?(child)
-        worker = workers.delete(child)
-        case worker
-        when :periodic_audit
-          say "ran auditor: #{worker}"
-        when :work_queue
-          say "work queue exited, restarting", :info
-          spawn_work_queue
-        else
-          say "child exited: #{child}, restarting", :info
-          # fork to handle unlocking (to prevent polluting the parent with worker objects)
-          unlock_pid = fork_with_reconnects do
-            unlock_orphaned_jobs(worker, child)
-          end
-          Process.wait unlock_pid
-          spawn_worker(worker.config)
+      maintain_children
+      case sig = @signal_queue.shift
+      when nil
+        pool_sleep
+      when :QUIT
+        break
+      when :TERM, :INT
+        stop(graceful: false) if Settings.kill_workers_on_exit
+        break
+      else
+        logger.warn("Unexpected signal received: #{sig}")
+      end
+    end
+  end
+
+  def pool_sleep
+    IO.select([@self_pipe[0]], nil, nil, POOL_SLEEP_PERIOD)
+    @self_pipe[0].read_nonblock(11, exception: false)
+  end
+
+  def stop(graceful: true, timeout: Settings.slow_exit_timeout)
+    signal_for_children = graceful ? :QUIT : :TERM
+    if Settings.kill_workers_on_exit
+      limit = Time.now + timeout
+      until @workers.empty? || Time.now >= limit
+        signal_all_children(signal_for_children)
+        # Give our children some time to process the signal before checking if
+        # they've exited
+        sleep(0.5)
+        reap_all_children.each { |pid| @workers.delete(pid) }
+      end
+
+      # We really want to give the workers every oportunity to clean up after
+      # themselves before murdering them.
+      stop(graceful: false, timeout: 2) if graceful
+      signal_all_children(:KILL)
+    else
+      signal_all_children(signal_for_children)
+    end
+  end
+
+  def signal_all_children(signal)
+    workers.keys.each { |pid| signal_child(signal, pid) }
+  end
+
+  def signal_child(signal, pid)
+    Process.kill(signal, pid)
+  rescue Erron::ESRCH
+    workers.delete(pid)
+  end
+
+  # Respawn all children that have exited since we last checked
+  def maintain_children
+    reap_all_children.each do |pid|
+      respawn_child(pid)
+    end
+  end
+
+  # Reaps processes that have exited or just returns if none have exited
+  #
+  # @return Array An array of child pids that have exited
+  def reap_all_children
+    exited_pids = []
+    begin
+      pid = Process.wait(-1, Process::WNOHANG)
+      break unless pid
+      exited_pids << pid
+    rescue Errno::ECHILD
+      break
+    end while true # I hate doing loops this way but it's the only way to make the rescue work
+    exited_pids
+  end
+
+  def respawn_child(child)
+    if workers.include?(child)
+      worker = workers.delete(child)
+      case worker
+      when :periodic_audit
+        say "ran auditor: #{worker}"
+      when :work_queue
+        say "work queue exited, restarting", :info
+        spawn_work_queue
+      else
+        say "child exited: #{child}, restarting", :info
+        # fork to handle unlocking (to prevent polluting the parent with worker objects)
+        unlock_pid = fork_with_reconnects do
+          unlock_orphaned_jobs(worker, child)
         end
+        Process.wait unlock_pid
+        spawn_worker(worker.config)
       end
     end
   end
+
+  def wake_up
+    @self_pipe[1].write_nonblock('.', exception: false)
+  end
 end
 end

data/lib/delayed/settings.rb

@@ -5,19 +5,21 @@ require 'active_support/core_ext/hash/indifferent_access'
 module Delayed
   module Settings
     SETTINGS = [
-      :queue,
-      :max_attempts,
-      :sleep_delay,
-      :sleep_delay_stagger,
-      :fetch_batch_size,
-      :select_random_from_batch,
-      :worker_procname_prefix,
-      :pool_procname_suffix,
       :default_job_options,
-      :silence_periodic_log,
       :disable_periodic_jobs,
       :disable_automatic_orphan_unlocking,
+      :fetch_batch_size,
+      :kill_workers_on_exit,
       :last_ditch_logfile,
+      :max_attempts,
+      :pool_procname_suffix,
+      :queue,
+      :select_random_from_batch,
+      :silence_periodic_log,
+      :sleep_delay,
+      :sleep_delay_stagger,
+      :slow_exit_timeout,
+      :worker_procname_prefix,
     ]
     SETTINGS_WITH_ARGS = [ :num_strands ]
 
@@ -62,6 +64,11 @@ module Delayed
     self.num_strands = ->(strand_name){ nil }
     self.default_job_options = ->{ Hash.new }
 
+    # Send workers KILL after QUIT if they haven't exited within the
+    # slow_exit_timeout
+    self.kill_workers_on_exit = true
+    self.slow_exit_timeout = 20
+
     def self.worker_config(config_filename = nil)
       config_filename ||= default_worker_config_name
       config = YAML.load(ERB.new(File.read(config_filename)).result)

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.13.7"
+  VERSION = "0.14.0"
 end

data/lib/delayed/work_queue/in_process.rb

@@ -12,6 +12,10 @@ class InProcess
         worker_config[:max_priority])
     end
   end
+
+  # intentional nops for compatibility w/ parent process
+  def close; end
+  def wake_up; end
 end
 end
 end

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

@@ -9,6 +9,11 @@ class ParentProcess
     def initialize(addrinfo, config: Settings.parent_process)
       @addrinfo = addrinfo
       @connect_timeout = config['client_connect_timeout'] || 2
+      @self_pipe = IO.pipe
+    end
+
+    def close
+      reset_connection
     end
 
     def get_and_lock_next_available(worker_name, worker_config)
@@ -24,11 +29,18 @@ class ParentProcess
         return reset_connection
       end
 
-      Marshal.load(socket).tap do |response|
-        unless response.nil? || (response.is_a?(Delayed::Job) && response.locked_by == worker_name)
-          raise(ProtocolError, "response is not a locked job: #{response.inspect}")
+      readers, _, _ = IO.select([socket, @self_pipe[0]])
+
+      if readers.include?(@self_pipe[0])
+        # we're probably exiting so we just want to break out of the blocking read
+        logger.debug("Broke out of select due to being awakened, exiting")
+      else
+        Marshal.load(socket).tap do |response|
+          unless response.nil? || (response.is_a?(Delayed::Job) && response.locked_by == worker_name)
+            raise(ProtocolError, "response is not a locked job: #{response.inspect}")
+          end
+          logger.debug("Received job #{response.id}")
         end
-        logger.debug("Received job #{response.id}")
       end
     rescue SystemCallError, IOError => ex
       logger.error("Work queue connection lost, reestablishing on next poll. (#{ex})")
@@ -37,6 +49,10 @@ class ParentProcess
       reset_connection
     end
 
+    def wake_up
+      @self_pipe[1].write_nonblock('.', exception: false)
+    end
+
     private
 
     def socket

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

@@ -5,6 +5,7 @@ class ParentProcess
     attr_reader :clients, :listen_socket
 
     include Delayed::Logging
+    SIGNALS = %i{INT TERM QUIT CHLD}
 
     def initialize(listen_socket, parent_pid: nil, config: Settings.parent_process)
       @listen_socket = listen_socket
@@ -15,6 +16,9 @@ class ParentProcess
 
       @config = config
       @client_timeout = config['server_socket_timeout'] || 10.0 # left for backwards compat
+
+      @exit = false
+      @self_pipe = IO.pipe
     end
 
     def connected_clients
@@ -30,6 +34,13 @@ class ParentProcess
     def run
       logger.debug "Starting work queue process"
 
+      SIGNALS.each do |sig|
+        # We're not doing any aggressive exiting here since we really want
+        # prefetched jobs to be unlocked and we're going to wake up the process
+        # from the IO.select we're using to wait on clients.
+        trap(sig) { @exit = true; @self_pipe[1].write_nonblock('.', exception: false) }
+      end
+
       last_orphaned_prefetched_jobs_purge = Job.db_time_now - rand(15 * 60)
       while !exit?
         run_once
@@ -47,7 +58,7 @@ class ParentProcess
     end
 
     def run_once
-      handles = @clients.keys + [@listen_socket]
+      handles = @clients.keys + [@listen_socket, @self_pipe[0]]
       timeout = Settings.sleep_delay + (rand * Settings.sleep_delay_stagger)
       readable, _, _ = IO.select(handles, nil, nil, timeout)
       if readable
@@ -60,6 +71,10 @@ class ParentProcess
     def handle_read(socket)
       if socket == @listen_socket
         handle_accept
+      elsif socket == @self_pipe[0]
+        # We really don't care about the contents of the pipe, we just need to
+        # wake up.
+        @self_pipe[0].read_nonblock(11, exception: false)
       else
         handle_request(socket)
       end
@@ -194,7 +209,7 @@ class ParentProcess
     end
 
     def exit?
-      parent_exited?
+      !!@exit || parent_exited?
     end
 
     def prefetch_owner

data/lib/delayed/worker.rb

@@ -6,6 +6,9 @@ require 'tmpdir'
 require 'set'
 
 class Worker
+  include Delayed::Logging
+  SIGNALS = %i{INT TERM QUIT CHLD}
+
   attr_reader :config, :queue_name, :min_priority, :max_priority, :work_queue
 
   # Callback to fire when a delayed job fails max_attempts times. If this
@@ -51,13 +54,16 @@ class Worker
     @config = options
     @job_count = 0
 
+    @self_pipe = IO.pipe
+    @signal_queue = []
+
     app = Rails.application
     if app && !app.config.cache_classes
-      Delayed::Worker.lifecycle.around(:perform) do |&block|
+      Delayed::Worker.lifecycle.around(:perform) do |worker, job, &block|
         reload = app.config.reload_classes_only_on_change != true || app.reloaders.map(&:updated?).any?
         ActionDispatch::Reloader.prepare! if reload
         begin
-          block.call
+          block.call(worker, job)
         ensure
           ActionDispatch::Reloader.cleanup! if reload
         end
@@ -76,27 +82,49 @@ class Worker
   end
 
   def exit?
-    @exit || parent_exited?
+    @exit
   end
 
-  def parent_exited?
-    @parent_pid && @parent_pid != Process.ppid
+  def wake_up
+    @self_pipe[1].write_nonblock('.', exception: false)
+    work_queue.wake_up
   end
 
   def start
-    say "Starting worker", :info
+    logger.info "Starting worker"
     set_process_name("start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}")
 
-    trap('INT') { say 'Exiting'; @exit = true }
+    work_thread = Thread.current
+    SIGNALS.each do |sig|
+      trap(sig) { @signal_queue << sig; wake_up }
+    end
 
-    self.class.lifecycle.run_callbacks(:execute, self) do
+    signal_processor = Thread.new do
       loop do
+        @self_pipe[0].read(1)
+        case @signal_queue.pop
+        when :INT, :TERM
+          @exit = true # get the main thread to bail early if it's waiting for a job
+          work_thread.raise(SystemExit) # Force the main thread to bail out of the current job
+          break
+        when :QUIT, :CHLD
+          @exit = true
+        else
+          logger.error "Unknown signal '#{sig}' received"
+        end
+      end
+    end
+
+    self.class.lifecycle.run_callbacks(:execute, self) do
+      until exit? do
         run
-        break if exit?
       end
     end
 
-    say "Stopping worker", :info
+    work_queue.close
+    signal_processor.kill
+    signal_processor.join
+    logger.info "Stopping worker"
   rescue => e
     Rails.logger.fatal("Child process died: #{e.inspect}") rescue nil
     self.class.lifecycle.run_callbacks(:exceptional_exit, self, e) { }
@@ -105,6 +133,7 @@ class Worker
   end
 
   def run
+    return if exit?
     self.class.lifecycle.run_callbacks(:loop, self) do
       set_process_name("pop:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}")
       job = self.class.lifecycle.run_callbacks(:pop, self) do
@@ -116,23 +145,23 @@ class Worker
           @job_count += perform(job)
 
           if @max_job_count > 0 && @job_count >= @max_job_count
-            say "Max job count of #{@max_job_count} exceeded, dying"
+            logger.debug "Max job count of #{@max_job_count} exceeded, dying"
             @exit = true
           end
 
           if @max_memory_usage > 0
             memory = sample_memory
             if memory > @max_memory_usage
-              say "Memory usage of #{memory} exceeds max of #{@max_memory_usage}, dying"
+              logger.debug "Memory usage of #{memory} exceeds max of #{@max_memory_usage}, dying"
               @exit = true
             else
-              say "Memory usage: #{memory}"
+              logger.debug "Memory usage: #{memory}"
             end
           end
         end
       else
         set_process_name("wait:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || 'max'}")
-        sleep(Settings.sleep_delay + (rand * Settings.sleep_delay_stagger))
+        sleep(Settings.sleep_delay + (rand * Settings.sleep_delay_stagger)) unless exit?
       end
     end
   end
@@ -142,7 +171,7 @@ class Worker
     raise Delayed::Backend::JobExpired, "job expired at #{job.expires_at}" if job.expired?
     self.class.lifecycle.run_callbacks(:perform, self, job) do
       set_process_name("run:#{Settings.worker_procname_prefix}#{job.id}:#{job.name}")
-      say("Processing #{log_job(job, :long)}", :info)
+      logger.info("Processing #{log_job(job, :long)}")
       runtime = Benchmark.realtime do
         if job.batch?
           # each job in the batch will have perform called on it, so we don't
@@ -153,9 +182,14 @@ class Worker
         end
         job.destroy
       end
-      say("Completed #{log_job(job)} #{"%.0fms" % (runtime * 1000)}", :info)
+      logger.info("Completed #{log_job(job)} #{"%.0fms" % (runtime * 1000)}")
     end
     count
+  rescue SystemExit
+    # There wasn't really a failure here so no callbacks and whatnot needed,
+    # still reschedule the job though.
+    job.reschedule
+    count
   rescue Exception => e
     self.class.lifecycle.run_callbacks(:error, self, job, e) do
       handle_failed_job(job, e)
@@ -179,7 +213,7 @@ class Worker
 
   def handle_failed_job(job, error)
     job.last_error = "#{error.message}\n#{error.backtrace.join("\n")}"
-    say("Failed with #{error.class} [#{error.message}] (#{job.attempts} attempts)", :error)
+    logger.error("Failed with #{error.class} [#{error.message}] (#{job.attempts} attempts)")
     job.reschedule(error)
   end
 
@@ -187,10 +221,6 @@ class Worker
     Process.pid
   end
 
-  def say(msg, level = :debug)
-    Rails.logger.send(level, msg)
-  end
-
   def log_job(job, format = :short)
     case format
     when :long

data/spec/delayed/daemon_spec.rb

@@ -24,10 +24,10 @@ RSpec.describe Delayed::Daemon do
       subject.stop
     end
 
-    it 'sends INT by default' do
+    it 'sends QUIT by default' do
       expect(subject).to receive(:status).with(print: false, pid: pid).and_return(:running)
       expect(subject).to receive(:puts).with(/Stopping pool/)
-      expect(Process).to receive(:kill).with('INT', pid)
+      expect(Process).to receive(:kill).with('QUIT', pid)
       expect(subject).to receive(:wait).with(false)
       subject.stop
     end

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

@@ -21,6 +21,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
   it 'marshals the given arguments to the server and returns the response' do
     expect(addrinfo).to receive(:connect).once.and_return(connection)
     expect(connection).to receive(:eof?).and_return(false)
+    expect(IO).to receive(:select).and_return([[connection], nil, nil])
     expect(Marshal).to receive(:dump).with(args, connection).ordered
     expect(Marshal).to receive(:load).with(connection).and_return(job).ordered
     response = subject.get_and_lock_next_available(*args)
@@ -30,6 +31,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
   it 'returns nil and then reconnects on socket write error' do
     expect(addrinfo).to receive(:connect).once.and_return(connection)
     expect(Marshal).to receive(:dump).and_raise(SystemCallError.new("failure"))
+    expect(IO).to receive(:select).and_return([[connection], nil, nil])
     expect(connection).to receive(:close)
     response = subject.get_and_lock_next_available(*args)
     expect(response).to be_nil
@@ -46,6 +48,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
     expect(addrinfo).to receive(:connect).once.and_return(connection)
     expect(connection).to receive(:eof?).and_return(true)
     expect(Marshal).to receive(:dump).with(args, connection).ordered
+    expect(IO).to receive(:select).and_return([[connection], nil, nil])
     expect(connection).to receive(:close)
     response = subject.get_and_lock_next_available(*args)
     expect(response).to be_nil
@@ -61,6 +64,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
   it 'errors if the response is not a locked job' do
     expect(addrinfo).to receive(:connect).once.and_return(connection)
     expect(Marshal).to receive(:dump).with(args, connection)
+    expect(IO).to receive(:select).and_return([[connection], nil, nil])
     expect(Marshal).to receive(:load).with(connection).and_return(:not_a_job)
     expect(connection).to receive(:eof?).and_return(false)
 
@@ -71,6 +75,7 @@ RSpec.describe Delayed::WorkQueue::ParentProcess::Client do
     expect(addrinfo).to receive(:connect).once.and_return(connection)
     expect(Marshal).to receive(:dump).with(args, connection)
     job.locked_by = "somebody_else"
+    expect(IO).to receive(:select).and_return([[connection], nil, nil])
     expect(Marshal).to receive(:load).with(connection).and_return(job)
     expect(connection).to receive(:eof?).and_return(false)
 

data/spec/gemfiles/42.gemfile.lock

@@ -1,98 +1,100 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.12.3)
-      after_transaction_commit (~> 1.0)
+    inst-jobs (0.13.4)
+      after_transaction_commit (>= 1.0, < 3)
       rails (>= 4.2)
       redis (> 3.0)
       redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.3.2)
+      rufus-scheduler (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
       globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.9)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    after_transaction_commit (1.1.1)
+    after_transaction_commit (1.1.2)
       activerecord (>= 4.0)
     arel (6.0.4)
-    backports (3.7.0)
+    backports (3.8.0)
     builder (3.2.3)
-    bump (0.5.3)
+    bump (0.5.4)
     byebug (9.0.6)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    database_cleaner (1.3.0)
+    database_cleaner (1.6.1)
     diff-lcs (1.3)
     erubis (2.7.0)
+    et-orbi (1.0.5)
+      tzinfo
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    i18n (0.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     multi_json (1.12.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.20.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    pg (0.21.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.5)
+    rack (1.6.8)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
+      railties (= 4.2.9)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -102,9 +104,9 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
@@ -124,8 +126,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rufus-scheduler (3.3.4)
-      tzinfo
+    rufus-scheduler (3.4.2)
+      et-orbi (~> 1.0)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -149,7 +151,7 @@ GEM
       activerecord (>= 3.2)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     timecop (0.7.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -159,9 +161,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  after_transaction_commit (< 2)
   bump
   byebug
-  database_cleaner (= 1.3.0)
+  database_cleaner (= 1.6.1)
   inst-jobs!
   pg
   pry
@@ -176,4 +179,4 @@ DEPENDENCIES
   wwtd (~> 1.3.0)
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/spec/gemfiles/50.gemfile.lock

@@ -1,113 +1,115 @@
 PATH
   remote: ../..
   specs:
-    inst-jobs (0.12.3)
-      after_transaction_commit (~> 1.0)
+    inst-jobs (0.13.4)
+      after_transaction_commit (>= 1.0, < 3)
       rails (>= 4.2)
       redis (> 3.0)
       redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.3.2)
+      rufus-scheduler (~> 3.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
+    actioncable (5.0.5)
+      actionpack (= 5.0.5)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.5)
+      actionview (= 5.0.5)
+      activesupport (= 5.0.5)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.5)
+      activesupport (= 5.0.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.0.5)
+      activesupport (= 5.0.5)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.5)
+      activesupport (= 5.0.5)
+    activerecord (5.0.5)
+      activemodel (= 5.0.5)
+      activesupport (= 5.0.5)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    after_transaction_commit (1.1.1)
-      activerecord (>= 4.0)
+    after_transaction_commit (2.0.0)
+      activerecord (>= 5.0)
     arel (7.1.4)
-    backports (3.7.0)
+    backports (3.8.0)
     builder (3.2.3)
-    bump (0.5.3)
+    bump (0.5.4)
     byebug (9.0.6)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    database_cleaner (1.3.0)
+    database_cleaner (1.6.1)
     diff-lcs (1.3)
     erubis (2.7.0)
+    et-orbi (1.0.5)
+      tzinfo
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    i18n (0.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
     multi_json (1.12.1)
     mustermann (1.0.0.beta2)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.20.0)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    pg (0.21.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-protection (2.0.0.beta2)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+    rails (5.0.5)
+      actioncable (= 5.0.5)
+      actionmailer (= 5.0.5)
+      actionpack (= 5.0.5)
+      actionview (= 5.0.5)
+      activejob (= 5.0.5)
+      activemodel (= 5.0.5)
+      activerecord (= 5.0.5)
+      activesupport (= 5.0.5)
+      bundler (>= 1.3.0)
+      railties (= 5.0.5)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.5)
+      actionpack (= 5.0.5)
+      activesupport (= 5.0.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -128,8 +130,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rufus-scheduler (3.3.4)
-      tzinfo
+    rufus-scheduler (3.4.2)
+      et-orbi (~> 1.0)
     sinatra (2.0.0.beta2)
       mustermann (= 1.0.0.beta2)
       rack (~> 2.0)
@@ -151,11 +153,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.7)
+    tilt (2.0.8)
     timecop (0.7.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -170,7 +170,7 @@ PLATFORMS
 DEPENDENCIES
   bump
   byebug
-  database_cleaner (= 1.3.0)
+  database_cleaner (= 1.6.1)
   inst-jobs!
   pg
   pry
@@ -180,9 +180,8 @@ DEPENDENCIES
   rspec (= 3.4.0)
   sinatra (= 2.0.0.beta2)
   sinatra-contrib (= 2.0.0.beta2)
-  test_after_commit (= 0.4.1)
   timecop (= 0.7.1)
   wwtd (~> 1.3.0)
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/spec/gemfiles/51.gemfile.lock

@@ -0,0 +1,187 @@
+PATH
+  remote: ../..
+  specs:
+    inst-jobs (0.13.3)
+      after_transaction_commit (~> 1.0)
+      rails (>= 4.2)
+      redis (> 3.0)
+      redis-scripting (~> 1.0.1)
+      rufus-scheduler (~> 3.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.1)
+      actionpack (= 5.1.1)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.1)
+      activesupport (= 5.1.1)
+      globalid (>= 0.3.6)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
+      arel (~> 8.0)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    after_transaction_commit (1.1.2)
+      activerecord (>= 4.0)
+    arel (8.0.0)
+    backports (3.7.0)
+    builder (3.2.3)
+    bump (0.5.3)
+    byebug (9.0.6)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    erubi (1.6.0)
+    et-orbi (1.0.3)
+      tzinfo
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.4)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
+    multi_json (1.12.1)
+    mustermann (1.0.0.beta2)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    pg (0.21.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (2.0.3)
+    rack-protection (2.0.0.beta2)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.1.1)
+      actioncable (= 5.1.1)
+      actionmailer (= 5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      activemodel (= 5.1.1)
+      activerecord (= 5.1.1)
+      activesupport (= 5.1.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.1.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    redis (3.3.3)
+    redis-scripting (1.0.1)
+      redis (>= 3.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rufus-scheduler (3.4.0)
+      et-orbi (~> 1.0)
+    sinatra (2.0.0.beta2)
+      mustermann (= 1.0.0.beta2)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0.beta2)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.0.beta2)
+      backports (>= 2.0)
+      multi_json
+      mustermann (= 1.0.0.beta2)
+      rack-protection (= 2.0.0.beta2)
+      rack-test
+      sinatra (= 2.0.0.beta2)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    timecop (0.7.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  byebug
+  database_cleaner (= 1.6.1)
+  inst-jobs!
+  pg
+  pry
+  rack-test
+  rails (~> 5.1.0)
+  rake
+  rspec (= 3.4.0)
+  sinatra (= 2.0.0.beta2)
+  sinatra-contrib (= 2.0.0.beta2)
+  timecop (= 0.7.1)
+  wwtd (~> 1.3.0)
+
+BUNDLED WITH
+   1.14.6

data/spec/shared/worker.rb

@@ -373,7 +373,6 @@ shared_examples_for 'Delayed::Worker' do
   describe "#start" do
     it "fires off an execute callback on the processing jobs loop" do
       fired = false
-      expect(@worker).to receive(:run)
       expect(@worker).to receive(:exit?).and_return(true)
       Delayed::Worker.lifecycle.before(:execute) { |w| w == @worker && fired = true }
       @worker.start

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.14.0
 platform: ruby
 authors:
 - Tobias Luetke
 - Brian Palmer
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_transaction_commit
@@ -263,7 +263,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/inst_jobs
 - db/migrate/20101216224513_create_delayed_jobs.rb
 - db/migrate/20110208031356_add_delayed_jobs_tag.rb
 - db/migrate/20110426161613_add_delayed_jobs_max_attempts.rb
@@ -285,6 +284,7 @@ files:
 - db/migrate/20151123210429_add_expires_at_to_jobs.rb
 - db/migrate/20151210162949_improve_max_concurrent.rb
 - db/migrate/20161206323555_add_back_default_string_limits_jobs.rb
+- exe/inst_jobs
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
 - lib/delayed/backend/redis/bulk_update.lua
@@ -343,6 +343,7 @@ files:
 - spec/gemfiles/50.gemfile
 - spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/51.gemfile
+- spec/gemfiles/51.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb
@@ -373,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
@@ -393,6 +394,7 @@ test_files:
 - spec/gemfiles/50.gemfile
 - spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/51.gemfile
+- spec/gemfiles/51.gemfile.lock
 - spec/migrate/20140924140513_add_story_table.rb
 - spec/redis_job_spec.rb
 - spec/sample_jobs.rb