resqued 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d676781c710a5929a262528a3069776cb67a4a71
-  data.tar.gz: 4a3f3696df1f647046be37c7d0bd3dc47de0206b
+  metadata.gz: 06883e41037ccd453274da0f9e3727fcbcb6801c
+  data.tar.gz: 2f63d5e0ee2b1c2189edfdf5985438608e061d6d
 SHA512:
-  metadata.gz: f379966b96f5f6eb0351bb67c32b1b260333b52868a401f058b7ae011155675193d4b41cf5adb9aea007d8e1f38aa328bacd6378fb133e6662952afda5f7b349
-  data.tar.gz: d7ba90498260585f55791551f38d6701d834d85a15893463c71954876c23d5c2d22c5258f1004ac51dd6b26e234d7ba002c09b93d7d887189fbe461a7756ea86
+  metadata.gz: caf06d5cba99ab3bf12c0f699efd72ac896e75bbf14a4e4a6a58c6068d0666f03aad0e12c8aa4b1c837309d419d6144e3b77d2ba4c648719327d03bf42b8253c
+  data.tar.gz: 4790df77dc5cd23349e3576693345b26251c7432d83d307370e1ecfcaa1a811cd570ee30843e801e85c5addf4656a906c4a44b381f7aeb848e56b3030aace183

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.8.3
+------
+* Add a "fast-exit" mode (#44)
+
 v0.8.2
 ------
 * Detach more completely (#43)

data/docs/signals.md

@@ -24,8 +24,8 @@ The Master process handles several signals.
 
 * `HUP`: Start a new listener. After it boots, kill the previous listener with `SIGQUIT`.
 * `USR2`: Pause processing. Kills the current listener, and does not start a replacement.
-* `CONT`: Resume processing. If there is no listener, start one. If there is a listener, send it SIGCONT.
-* `QUIT`, `INT`, or `TERM`: Kill the listener with the same signal and wait for it to exit.
+* `CONT`: Resume processing. If there is no listener, start one. If there is a listener, send it `SIGCONT`.
+* `QUIT`, `INT`, or `TERM`: Kill the listener with the same signal and wait for it to exit. If `--fast-exit` was specified, the master exits immediately without waiting for the listener to exit.
 * `CHLD`: Clean up any listeners that have exited. If the current listener exited
 
 ## Listener

data/exe/resqued

@@ -30,6 +30,10 @@ opts = OptionParser.new do |opts|
     test = true
   end
 
+  opts.on '--fast-exit', 'Exit quickly on SIGQUIT, SIGTERM' do
+    options[:fast_exit] = true
+  end
+
   opts.on '-p', '--pidfile PIDFILE', 'Store the pid of the master process in PIDFILE' do |v|
     options[:master_pidfile] = v
   end

data/lib/resqued/listener.rb

@@ -186,13 +186,15 @@ module Resqued
 
     # Private: Check if master reports any dead workers.
     def check_for_expired_workers
+      return unless @socket
       loop do
         IO.select([@socket], nil, nil, 0) or return
         line = @socket.readline
         finish_worker(line.to_i, nil)
       end
-    rescue EOFError, Errno::ECONNRESET
-      log "eof from master"
+    rescue EOFError, Errno::ECONNRESET => e
+      @socket = nil
+      log "#{e.class.name} while reading from master"
       Process.kill(:QUIT, $$)
     end
 
@@ -234,8 +236,10 @@ module Resqued
     #     report_to_master("+12345,queue")  # Worker process PID:12345 started, working on a job from "queue".
     #     report_to_master("-12345")        # Worker process PID:12345 exited.
     def report_to_master(status)
-      @socket.puts(status)
-    rescue Errno::EPIPE
+      @socket.puts(status) if @socket
+    rescue Errno::EPIPE => e
+      @socket = nil
+      log "#{e.class.name} while writing to master"
       Process.kill(:QUIT, $$) # If the master is gone, LIFE IS NOW MEANINGLESS.
     end
 

data/lib/resqued/master.rb

@@ -20,6 +20,7 @@ module Resqued
       @config_paths = options.fetch(:config_paths)
       @pidfile      = options.fetch(:master_pidfile) { nil }
       @status_pipe  = options.fetch(:status_pipe) { nil }
+      @fast_exit    = options.fetch(:fast_exit) { false }
       @listener_backoff = Backoff.new
       @listeners_created = 0
     end
@@ -66,7 +67,7 @@ module Resqued
         when :INT, :TERM, :QUIT
           log "Shutting down..."
           kill_all_listeners(signal)
-          wait_for_workers
+          wait_for_workers unless @fast_exit
           break
         end
       end

data/lib/resqued/version.rb

@@ -1,3 +1,3 @@
 module Resqued
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/resqued/sleepy_spec.rb

@@ -27,4 +27,8 @@ describe Resqued::Sleepy 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
+    expect { yawn(0.5, nil) }.to run_for(0.5)
+  end
 end

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: resqued
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Matt Burke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kgio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.9.1
 - !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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 description: Daemon of resque workers
@@ -94,13 +94,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGES.md
+- MIT-LICENSE
+- README.md
+- docs/ipc.md
+- docs/processes.md
+- docs/signals.md
+- exe/resqued
+- exe/resqued-listener
+- lib/resqued.rb
 - lib/resqued/backoff.rb
+- lib/resqued/config.rb
 - lib/resqued/config/after_fork.rb
 - lib/resqued/config/base.rb
 - lib/resqued/config/before_fork.rb
 - lib/resqued/config/dsl.rb
 - lib/resqued/config/worker.rb
-- lib/resqued/config.rb
 - lib/resqued/daemon.rb
 - lib/resqued/listener.rb
 - lib/resqued/listener_proxy.rb
@@ -113,13 +122,6 @@ files:
 - lib/resqued/test_case.rb
 - lib/resqued/version.rb
 - lib/resqued/worker.rb
-- lib/resqued.rb
-- README.md
-- CHANGES.md
-- MIT-LICENSE
-- docs/ipc.md
-- docs/processes.md
-- docs/signals.md
 - spec/fixtures/test_case_after_fork_raises.rb
 - spec/fixtures/test_case_before_fork_raises.rb
 - spec/fixtures/test_case_clean.rb
@@ -134,8 +136,6 @@ files:
 - spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
-- exe/resqued
-- exe/resqued-listener
 homepage: https://github.com/spraints/resqued
 licenses:
 - MIT
@@ -146,17 +146,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Daemon of resque workers
@@ -175,3 +175,4 @@ test_files:
 - spec/resqued/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/custom_matchers.rb
+has_rdoc: