resque-pool 0.4.0.rc2 → 0.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c09d6a6f29e55d9b78db9d4ab9b20fc7c4d6ff8
-  data.tar.gz: a1bad283f4cd04efa34d8a3d3651e27dca80af88
+  metadata.gz: faf10d33dce6efc9e10e62c0fcb8e8ab0e68f7be
+  data.tar.gz: 00b0e5a60ca0bc806e65d86bc3ede09dc8988c0d
 SHA512:
-  metadata.gz: 4b0c682b1dfeed43223a616adae8ed7ec6847dc7099f515ea16d0e39f2c295879c652ef36a08e24f6704ca20559614bfb02ab4b04150af296ecd55990cc309b3
-  data.tar.gz: fb9a994b4f8454279e9a3e21a3d0f3faac7cb6b74ffe0a6711b8ba063d5e0208ec2a24960240b33b17291ccc1ffbaadab2f05f71f6a2bff1c075129e9aba2a9c
+  metadata.gz: 600b56e3f0f6dcd2b9114b0f8a0e4ea66672415c5814b6d957beee91f3d642937529ab0d0bd3847ded91d646069cdd6995a9e1f6384a850f9cc35d84b0c889e1
+  data.tar.gz: efa23c535e3dc82e22c2e8249da2c6c848e0a8c006dc4126d92c76f92ce3d510ef567ed69198b2514caf2d2c87aef2345fe7877841370fa03d2119d664035d49

data/README.md

@@ -70,6 +70,17 @@ the following into `lib/tasks/resque.rake`:
       end
     end
 
+
+For normal work with fresh resque and resque-scheduler gems add next lines in lib/rake/resque.rake
+
+```ruby
+task 'resque:pool:setup' do
+  Resque::Pool.after_prefork do |job|
+    Resque.redis.client.reconnect
+  end
+end
+```
+
 ### Start the pool manager
 
 Then you can start the queues via:

data/lib/resque/pool.rb

@@ -59,7 +59,7 @@ module Resque
     # Config: class methods to start up the pool using the default config {{{
 
     @config_files = ["resque-pool.yml", "config/resque-pool.yml"]
-    class << self; attr_accessor :config_files, :app_name; end
+    class << self; attr_accessor :config_files, :app_name, :spawn_delay; end
 
     def self.app_name
       @app_name ||= File.basename(Dir.pwd)
@@ -215,17 +215,13 @@ module Resque
       when :INT
         graceful_worker_shutdown!(signal)
       when :TERM
-        if term_child
+        case self.class.term_behavior
+        when "graceful_worker_shutdown_and_wait"
+          graceful_worker_shutdown_and_wait!(signal)
+        when "graceful_worker_shutdown"
           graceful_worker_shutdown!(signal)
         else
-          case self.class.term_behavior
-          when "graceful_worker_shutdown_and_wait"
-            graceful_worker_shutdown_and_wait!(signal)
-          when "graceful_worker_shutdown"
-            graceful_worker_shutdown!(signal)
-          else
-            shutdown_everything_now!(signal)
-          end
+          shutdown_everything_now!(signal)
         end
       end
     end
@@ -348,6 +344,7 @@ module Resque
     end
 
     def signal_all_workers(signal)
+      log "Sending #{signal} to all workers"
       all_pids.each do |pid|
         Process.kill signal, pid
       end
@@ -375,6 +372,7 @@ module Resque
     def spawn_missing_workers_for(queues)
       worker_delta_for(queues).times do |nr|
         spawn_worker!(queues)
+        sleep Resque::Pool.spawn_delay if Resque::Pool.spawn_delay
       end
     end
 
@@ -411,6 +409,10 @@ module Resque
       worker = ::Resque::Worker.new(*queues)
       worker.term_timeout = ENV['RESQUE_TERM_TIMEOUT'] || 4.0
       worker.term_child = ENV['TERM_CHILD']
+      if worker.respond_to?(:run_at_exit_hooks=)
+        # resque doesn't support this until 1.24, but we support 1.22
+        worker.run_at_exit_hooks = ENV['RUN_AT_EXIT_HOOKS'] || false
+      end
       if ENV['LOGGING'] || ENV['VERBOSE']
         worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
       end

data/lib/resque/pool/cli.rb

@@ -1,10 +1,13 @@
 require 'trollop'
 require 'resque/pool'
+require 'resque/pool/logging'
 require 'fileutils'
 
 module Resque
   class Pool
     module CLI
+      include Logging
+      extend  Logging
       extend self
 
       def run
@@ -38,6 +41,7 @@ where [options] are:
           opt :nosync, "Don't sync logfiles on every write"
           opt :pidfile, "PID file location",         :type => String,    :short => "-p"
           opt :environment, "Set RAILS_ENV/RACK_ENV/RESQUE_ENV", :type => String, :short => "-E"
+          opt :spawn_delay, "Delay in milliseconds between spawning missing workers", :type => Integer, :short => "-s"
           opt :term_graceful_wait, "On TERM signal, wait for workers to shut down gracefully"
           opt :term_graceful,      "On TERM signal, shut down workers gracefully"
           opt :term_immediate,     "On TERM signal, shut down workers immediately (default)"
@@ -113,6 +117,15 @@ where [options] are:
           Resque::Pool.term_behavior = "graceful_worker_shutdown_and_wait"
         elsif opts[:term_graceful]
           Resque::Pool.term_behavior = "graceful_worker_shutdown"
+        elsif ENV["TERM_CHILD"]
+          log "TERM_CHILD enabled, so will user 'term-graceful-and-wait' behaviour"
+          Resque::Pool.term_behavior = "graceful_worker_shutdown_and_wait"
+        end
+        if ENV.include?("DYNO") && !ENV["TERM_CHILD"]
+          log "WARNING: Are you running on Heroku? You should probably set TERM_CHILD=1"
+        end
+        if opts[:spawn_delay]
+          Resque::Pool.spawn_delay = opts[:spawn_delay] * 0.001
         end
       end
 

data/lib/resque/pool/pooled_worker.rb

@@ -2,14 +2,26 @@ require 'resque/worker'
 
 class Resque::Pool
   module PooledWorker
-    def shutdown_with_pool
-      shutdown_without_pool || Process.ppid == 1
+
+    def initialize_with_pool(*args)
+      @pool_master_pid = Process.pid
+      initialize_without_pool(*args)
+    end
+
+    def pool_master_has_gone_away?
+      @pool_master_pid && @pool_master_pid != Process.ppid
+    end
+
+    def shutdown_with_pool?
+      shutdown_without_pool? || pool_master_has_gone_away?
     end
 
     def self.included(base)
       base.instance_eval do
-        alias_method :shutdown_without_pool, :shutdown?
-        alias_method :shutdown?, :shutdown_with_pool
+        alias_method :initialize_without_pool, :initialize
+        alias_method :initialize, :initialize_with_pool
+        alias_method :shutdown_without_pool?, :shutdown?
+        alias_method :shutdown?, :shutdown_with_pool?
       end
     end
 

data/lib/resque/pool/version.rb

@@ -1,5 +1,5 @@
 module Resque
   class Pool
-    VERSION = "0.4.0.rc2"
+    VERSION = "0.4.0.rc3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-pool
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc2
+  version: 0.4.0.rc3
 platform: ruby
 authors:
 - nicholas a. evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,27 +136,27 @@ files:
 - Rakefile
 - LICENSE.txt
 - Changelog.md
-- lib/resque/pool.rb
-- lib/resque/pool/tasks.rb
-- lib/resque/pool/pooled_worker.rb
 - lib/resque/pool/logging.rb
 - lib/resque/pool/cli.rb
 - lib/resque/pool/version.rb
+- lib/resque/pool/tasks.rb
+- lib/resque/pool/pooled_worker.rb
+- lib/resque/pool.rb
 - bin/resque-pool
-- man/resque-pool.yml.5
+- man/resque-pool.1.ronn
 - man/resque-pool.1
 - man/resque-pool.yml.5.ronn
-- man/resque-pool.1.ronn
+- man/resque-pool.yml.5
 - features/basic_daemon_config.feature
 - features/support/aruba_daemon_support.rb
 - features/support/env.rb
-- features/step_definitions/resque-pool_steps.rb
 - features/step_definitions/daemon_steps.rb
-- spec/mock_config.rb
+- features/step_definitions/resque-pool_steps.rb
 - spec/resque-pool.yml
-- spec/spec_helper.rb
-- spec/resque-pool-custom.yml.erb
+- spec/mock_config.rb
 - spec/resque_pool_spec.rb
+- spec/resque-pool-custom.yml.erb
+- spec/spec_helper.rb
 homepage: http://github.com/nevans/resque-pool
 licenses:
 - MIT
@@ -177,17 +177,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: quickly and easily fork a pool of resque workers
 test_files:
 - spec/mock_config.rb
-- spec/spec_helper.rb
 - spec/resque_pool_spec.rb
+- spec/spec_helper.rb
 - spec/resque-pool.yml
 - features/support/aruba_daemon_support.rb
 - features/support/env.rb
-- features/step_definitions/resque-pool_steps.rb
 - features/step_definitions/daemon_steps.rb
+- features/step_definitions/resque-pool_steps.rb
 - features/basic_daemon_config.feature
+has_rdoc: