resqued 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc14cf354d4cd292119aa6e6f06f0c59dd09faf982fe10707e69c5bbb3ef56e4
-  data.tar.gz: 7bad129217778e76f14c1dc6a732025d5cc0bba17baaee9d81ee5a1648768edc
+  metadata.gz: a96943adfc574c78c23d78e95aaeae7021c8f0d52ad823db5a39b70e19a3dc03
+  data.tar.gz: 8bbf849c80581ee3faedf6dda7a0a0ff673c56fe402fbdc0f8896689b51b74c0
 SHA512:
-  metadata.gz: e8b5e943ec7612022b8a937c6a380b1d396be6cd2c5ebad13239961232c992dcce54d42e807c1d52f036f102defe4492f4fd498f0299c33e40e5095dc26ab48f
-  data.tar.gz: a26e43be4a408d59d8db061c00b112e45a6fec8b6ba318e145cbac1e53b4087b12f9b2ba3510fa118714aeb8b0117673c90b6f7fb987ca028a8962c85f594e5f
+  metadata.gz: 2f07ccb1f95a61f283bbb2f12668a92dd8df5a4114d10f4f48b8b0ea825b916c54181e5efa64aded4b11798ad27677cf49b3c039ec6ef83f27cd07a520911ce6
+  data.tar.gz: 66703d00c84c7d010e6454c3bb9522efd499e57520e9e51d2dbfd769d1c2b795d8b1398d19e1283333db8057a804b5ce7d3b985bbe91bad3b2582e5126843692

data/CHANGES.md

@@ -1,5 +1,9 @@
 Starting with version 0.6.1, resqued uses semantic versioning to indicate incompatibilities between the master process, listener process, and configuration.
 
+v0.10.3
+-------
+* Fix a timing related crash during reload. (#60)
+
 v0.10.2
 -------
 * Shut down cleanly even if there are other stray child processes of the master. (#59)

data/lib/resqued/master.rb

@@ -200,7 +200,7 @@ module Resqued
           end
 
           if @listeners.last_good_pid == lpid
-            @state.clear_last_good!
+            @listeners.clear_last_good!
           end
 
           if dead_listener = @listeners.delete(lpid)

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.10.2'
+  VERSION = '0.10.3'
 end

data/spec/integration/listener_still_starting_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe "Listener still starting on SIGHUP" do
+  include ResquedIntegrationHelpers
+
+  it "expect master not to crash" do
+    start_resqued config: <<-CONFIG
+      before_fork do
+        sleep 1
+      end
+    CONFIG
+    expect_running listener: "listener #1"
+    restart_resqued
+    expect_running listener: "listener #2"
+  end
+
+  after do
+    begin
+      Process.kill(:QUIT, @pid) if @pid
+    rescue Errno::ESRCH
+    end
+  end
+end

data/spec/integration/master_inherits_child_spec.rb

@@ -22,7 +22,7 @@ describe "Resqued master with an extra child process" do
     }
 
     pid = spawn(env, shim_path, resqued_path, "--logfile", logfile, config_path)
-    sleep 1.0
+    sleep 2.0
     pid
   end
 

data/spec/integration/restart_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe "Resqued can restart" do
-  include ResquedPath
+  include ResquedIntegrationHelpers
 
   it "expect to be able to restart" do
     start_resqued
@@ -18,46 +18,4 @@ describe "Resqued can restart" do
     rescue Errno::ESRCH
     end
   end
-
-  def expect_running(listener:)
-    processes = list_processes
-    expect(processes).to include(is_resqued_master)
-    listeners = processes.select { |p| p[:ppid] == @pid }.map { |p| p[:args] }
-    expect(listeners).to all(match(/#{listener}/)).and(satisfy { |l| l.size == 1 })
-  end
-
-  def expect_not_running
-    processes = list_processes
-    expect(processes).not_to include(is_resqued_master)
-  end
-
-  def start_resqued
-    # Don't configure any workers. That way, we don't need to have redis running.
-    config_path = File.join(SPEC_TEMPDIR, "config.rb")
-    File.write(config_path, "")
-
-    logfile = File.join(SPEC_TEMPDIR, "resqued.log")
-    File.write(logfile, "") # truncate it
-
-    @pid = spawn resqued_path, "--logfile", logfile, config_path
-    sleep 1.0
-  end
-
-  def restart_resqued
-    Process.kill(:HUP, @pid)
-    sleep 1.0
-  end
-
-  def stop_resqued
-    Process.kill(:TERM, @pid)
-    sleep 1.0
-  end
-
-  def list_processes
-    `ps axo pid,ppid,args`.lines.map { |line| pid, ppid, args = line.strip.split(/\s+/, 3); { pid: pid.to_i, ppid: ppid.to_i, args: args } }
-  end
-
-  def is_resqued_master
-    satisfy { |p| p[:pid] == @pid && p[:args] =~ /resqued-/ }
-  end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "support/custom_matchers"
 require "support/resqued_path"
+require "support/resqued_integration_helpers"
 
 SPEC_TEMPDIR = File.expand_path("../tmp/spec", File.dirname(__FILE__))
 FileUtils.mkpath(SPEC_TEMPDIR)

data/spec/support/resqued_integration_helpers.rb

@@ -0,0 +1,50 @@
+module ResquedIntegrationHelpers
+  include ResquedPath
+
+  def start_resqued(config: "", debug: false)
+    # Don't configure any workers. That way, we don't need to have redis running.
+    config_path = File.join(SPEC_TEMPDIR, "config.rb")
+    File.write(config_path, config)
+
+    @pid =
+      if debug
+        spawn resqued_path, config_path
+      else
+        logfile = File.join(SPEC_TEMPDIR, "resqued.log")
+        File.write(logfile, "") # truncate it
+
+        spawn resqued_path, "--logfile", logfile, config_path
+      end
+    sleep 1.0
+  end
+
+  def restart_resqued
+    Process.kill(:HUP, @pid)
+    sleep 1.0
+  end
+
+  def expect_running(listener:)
+    processes = list_processes
+    expect(processes).to include(is_resqued_master)
+    listeners = processes.select { |p| p[:ppid] == @pid }.map { |p| p[:args] }
+    expect(listeners).to all(match(/#{listener}/)).and(satisfy { |l| l.size == 1 })
+  end
+
+  def expect_not_running
+    processes = list_processes
+    expect(processes).not_to include(is_resqued_master)
+  end
+
+  def stop_resqued
+    Process.kill(:TERM, @pid)
+    sleep 1.0
+  end
+
+  def list_processes
+    `ps axo pid,ppid,args`.lines.map { |line| pid, ppid, args = line.strip.split(/\s+/, 3); { pid: pid.to_i, ppid: ppid.to_i, args: args } }
+  end
+
+  def is_resqued_master
+    satisfy { |p| p[:pid] == @pid && p[:args] =~ /resqued-/ }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -137,6 +137,7 @@ files:
 - spec/fixtures/test_case_clean.rb
 - spec/fixtures/test_case_environment.rb
 - spec/fixtures/test_case_no_workers.rb
+- spec/integration/listener_still_starting_spec.rb
 - spec/integration/master_inherits_child_spec.rb
 - spec/integration/restart_spec.rb
 - spec/resqued/backoff_spec.rb
@@ -149,6 +150,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
 - spec/support/extra-child-shim
+- spec/support/resqued_integration_helpers.rb
 - spec/support/resqued_path.rb
 homepage: https://github.com/spraints/resqued
 licenses:
@@ -176,7 +178,9 @@ summary: Daemon of resque workers
 test_files:
 - spec/spec_helper.rb
 - spec/integration/restart_spec.rb
+- spec/integration/listener_still_starting_spec.rb
 - spec/integration/master_inherits_child_spec.rb
+- spec/support/resqued_integration_helpers.rb
 - spec/support/custom_matchers.rb
 - spec/support/resqued_path.rb
 - spec/support/extra-child-shim