resqued 0.9.0 → 0.10.0

data/spec/resqued/config_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require "spec_helper"
 
-require 'fileutils'
-require 'tmpdir'
+require "fileutils"
+require "tmpdir"
 
-require 'resqued/config'
+require "resqued/config"
 
 describe Resqued::Config do
   context do
@@ -19,8 +19,8 @@ describe Resqued::Config do
     end
     let(:config) { Resqued::Config.new([@config_file]) }
 
-    it("can require_relative") { config.build_workers ; expect($test_val).to eq(:ok) }
-    it("does not override require_relative in required files") { config.build_workers ; expect($other_test_val).to eq(:ok) }
+    it("can require_relative") { config.build_workers; expect($test_val).to eq(:ok) }
+    it("does not override require_relative in required files") { config.build_workers; expect($other_test_val).to eq(:ok) }
 
     def make_file(dir, relative_path, content)
       File.join(dir, relative_path).tap do |path|

data/spec/resqued/sleepy_spec.rb

@@ -1,34 +1,33 @@
-require 'spec_helper'
-require 'resqued/sleepy'
-require 'thread'
+require "spec_helper"
+require "resqued/sleepy"
 
 describe Resqued::Sleepy do
   include Resqued::Sleepy
 
-  it 'sleeps' do
+  it "sleeps" do
     expect { yawn(0.2) }.to run_for(0.2)
   end
 
-  it 'wakes on `awake`' do
-    Thread.new { sleep 0.1 ; awake }
+  it "wakes on `awake`" do
+    Thread.new { sleep 0.1; awake }
     expect { yawn(2.0) }.to run_for(0.1)
   end
 
-  it 'wakes on IO' do
+  it "wakes on IO" do
     rd, wr = IO.pipe
-    Thread.new { sleep 0.1 ; wr.write('.') }
+    Thread.new { sleep 0.1; wr.write(".") }
     expect { yawn(2.0, rd) }.to run_for(0.1)
   end
 
-  it 'does not sleep if duration is 0' do
+  it "does not sleep if duration is 0" do
     expect { yawn(-0.000001) }.to run_for(0.0)
   end
 
-  it 'does not sleep if duration is negative' do
+  it "does not sleep if duration is negative" do
     expect { yawn(0) }.to run_for(0.0)
   end
 
-  it 'sleeps if io is nil' do
+  it "sleeps if io is nil" do
     expect { yawn(0.5, nil) }.to run_for(0.5)
   end
 end

data/spec/resqued/test_case_spec.rb

@@ -1,14 +1,14 @@
-require 'spec_helper'
-require 'resqued/test_case'
+require "spec_helper"
+require "resqued/test_case"
 
 describe Resqued::TestCase do
   let(:test_case) { Object.new.extend(the_module) }
 
-  context 'LoadConfig' do
+  context "LoadConfig" do
     let(:the_module) { described_class::LoadConfig }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_clean.rb'              }.not_to raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_before_fork_raises.rb' }.to     raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_after_fork_raises.rb'  }.to     raise_error }
-    it { expect { test_case.assert_resqued 'spec/fixtures/test_case_environment.rb', 'spec/fixtures/test_case_no_workers.rb'         }.not_to raise_error }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_clean.rb"              }.not_to raise_error }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_before_fork_raises.rb" }.to     raise_error }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_after_fork_raises.rb"  }.to     raise_error }
+    it { expect { test_case.assert_resqued "spec/fixtures/test_case_environment.rb", "spec/fixtures/test_case_no_workers.rb"         }.not_to raise_error }
   end
 end

data/spec/spec_helper.rb

@@ -1 +1 @@
-require 'support/custom_matchers'
+require "support/custom_matchers"

data/spec/support/custom_matchers.rb

@@ -8,7 +8,7 @@ module CustomMatchers
   class RunFor
     def initialize(expected_duration)
       @expected_duration = expected_duration
-      @epsilon  = 0.01
+      @epsilon = 0.01
     end
 
     def within(epsilon)

data/spec/test_restart.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+set -e
+set -o nounset
+
+WORKDIR="$(mktemp)"
+PIDFILE="${WORKDIR}/resqued.pid"
+CONFIG="${WORKDIR}/config.rb"
+
+# mktemp makes a file, but we want a dir.
+rm -f "$WORKDIR"
+mkdir "$WORKDIR"
+
+set -x
+cd "$(dirname "$0")/.."
+
+main() {
+  trap cleanup EXIT
+
+  configure_resqued
+  start_resqued
+  restart_resqued
+  stop_resqued
+}
+
+configure_resqued() {
+  # Don't configure any workers. That way, we don't need to have redis running.
+  touch "${CONFIG}"
+}
+
+start_resqued() {
+  bin_resqued=bin/resqued
+  if [ -x gemfiles/bin/resqued ]; then
+    bin_resqued=gemfiles/bin/resqued
+  fi
+  $bin_resqued --pidfile "${PIDFILE}" "${CONFIG}" &
+  sleep 1
+  echo expect to find the master process and the first listener
+  running # set -e will make the test fail if it's not running
+  ps axo pid,args -H | grep [r]esqued-
+  ps axo pid,args | grep [r]esqued- | grep -q 'listener #1.*running'
+}
+
+restart_resqued() {
+  local pid="$(cat "${PIDFILE}")"
+  kill -HUP "$pid"
+  sleep 1
+  echo expect to find the master process and the second listener
+  running
+  ps axo pid,args -H | grep [r]esqued-
+  ps axo pid,args | grep [r]esqued- | grep -qv 'listener #1'
+  ps axo pid,args | grep [r]esqued- | grep -q 'listener #2.*running'
+}
+
+stop_resqued() {
+  local pid="$(cat "${PIDFILE}")"
+  kill -TERM "$pid"
+  sleep 1
+  echo expect everything to be stopped
+  if running >&/dev/null; then
+    echo "expected resqued to be stopped"
+    false
+  fi
+  ps axo pid,args -H | grep [r]esqued- || true
+  test -z "$(ps axo pid,args | grep [r]esqued-)"
+}
+
+running() {
+  set -e
+  test -f "${PIDFILE}"
+  local pid="$(cat "${PIDFILE}")"
+  kill -0 "$pid"
+  ps o pid,args "$pid"
+}
+
+cleanup() {
+  while running >&/dev/null; do
+    kill -TERM "$(cat "${PIDFILE}")"
+    sleep 2
+  done
+  rm -rfv "${WORKDIR}" || rm -rf "${WORKDIR}"
+}
+
+main

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.9.1
 - !ruby/object:Gem::Dependency
-  name: mono_logger
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: 0.9.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,24 +87,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.78.0
 description: Daemon of resque workers
 email: spraints@gmail.com
 executables:
 - resqued
-- resqued-listener
 extensions: []
 extra_rdoc_files: []
 files:
@@ -101,7 +114,6 @@ files:
 - docs/processes.md
 - docs/signals.md
 - exe/resqued
-- exe/resqued-listener
 - lib/resqued.rb
 - lib/resqued/backoff.rb
 - lib/resqued/config.rb
@@ -111,10 +123,14 @@ files:
 - lib/resqued/config/dsl.rb
 - lib/resqued/config/worker.rb
 - lib/resqued/daemon.rb
+- lib/resqued/exec_on_hup.rb
 - lib/resqued/listener.rb
+- lib/resqued/listener_pool.rb
 - lib/resqued/listener_proxy.rb
+- lib/resqued/listener_state.rb
 - lib/resqued/logging.rb
 - lib/resqued/master.rb
+- lib/resqued/master_state.rb
 - lib/resqued/pidfile.rb
 - lib/resqued/procline_version.rb
 - lib/resqued/runtime_info.rb
@@ -136,6 +152,7 @@ files:
 - spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
+- spec/test_restart.sh
 homepage: https://github.com/spraints/resqued
 licenses:
 - MIT
@@ -174,4 +191,5 @@ test_files:
 - spec/fixtures/test_case_no_workers.rb
 - spec/fixtures/test_case_after_fork_raises.rb
 - spec/fixtures/test_case_clean.rb
+- spec/test_restart.sh
 - spec/support/custom_matchers.rb

data/exe/resqued-listener

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-puts "resqued-listener is deprecated and will be removed."
-puts "Stop and start the master process to remove your dependence on resqued-listener."
-require 'resqued/listener'
-Resqued::Listener.exec!