resque-pool 0.4.0.rc3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faf10d33dce6efc9e10e62c0fcb8e8ab0e68f7be
-  data.tar.gz: 00b0e5a60ca0bc806e65d86bc3ede09dc8988c0d
+  metadata.gz: e53fe4edb6e3714b9290bb7c5aaa38cfc0cba522
+  data.tar.gz: 14d005755bff347031cb00eca84a32cfe0745e74
 SHA512:
-  metadata.gz: 600b56e3f0f6dcd2b9114b0f8a0e4ea66672415c5814b6d957beee91f3d642937529ab0d0bd3847ded91d646069cdd6995a9e1f6384a850f9cc35d84b0c889e1
-  data.tar.gz: efa23c535e3dc82e22c2e8249da2c6c848e0a8c006dc4126d92c76f92ce3d510ef567ed69198b2514caf2d2c87aef2345fe7877841370fa03d2119d664035d49
+  metadata.gz: 70c830c5077481580b4dfc228f65607e1af4f8a8577a4993965820a4422e96422391df3fa65264e60f9f16169a9279bab231b7fac5c30ec0c06e65874564b334
+  data.tar.gz: da6496b4c8174cd7196a0175e4fe6abe111337b0ff99a442b1e82eb68a869924352298ad55b8a8855bb50a563703422d0d1aac24da82b937a3b64da4336c69f5

data/README.md

@@ -70,17 +70,6 @@ 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, :spawn_delay; end
+    class << self; attr_accessor :config_files, :app_name; end
 
     def self.app_name
       @app_name ||= File.basename(Dir.pwd)
@@ -215,13 +215,17 @@ module Resque
       when :INT
         graceful_worker_shutdown!(signal)
       when :TERM
-        case self.class.term_behavior
-        when "graceful_worker_shutdown_and_wait"
-          graceful_worker_shutdown_and_wait!(signal)
-        when "graceful_worker_shutdown"
+        if term_child
           graceful_worker_shutdown!(signal)
         else
-          shutdown_everything_now!(signal)
+          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
         end
       end
     end
@@ -344,7 +348,6 @@ module Resque
     end
 
     def signal_all_workers(signal)
-      log "Sending #{signal} to all workers"
       all_pids.each do |pid|
         Process.kill signal, pid
       end
@@ -372,7 +375,6 @@ 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
 
@@ -409,10 +411,6 @@ 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,13 +1,10 @@
 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
@@ -41,7 +38,6 @@ 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)"
@@ -117,15 +113,6 @@ 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,26 +2,14 @@ require 'resque/worker'
 
 class Resque::Pool
   module PooledWorker
-
-    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?
+    def shutdown_with_pool
+      shutdown_without_pool || Process.ppid == 1
     end
 
     def self.included(base)
       base.instance_eval do
-        alias_method :initialize_without_pool, :initialize
-        alias_method :initialize, :initialize_with_pool
-        alias_method :shutdown_without_pool?, :shutdown?
-        alias_method :shutdown?, :shutdown_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.rc3"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-pool
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc3
+  version: 0.4.0
 platform: ruby
 authors:
 - nicholas a. evans
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -172,9 +172,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14