resque-pool 0.4.0.rc1 → 0.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05af825a91f84b2401987a45cc96b8e9fc520ac5
-  data.tar.gz: 052428aeaaa748cc7a7475d027c2f1c11cdd23ff
+  metadata.gz: 0c09d6a6f29e55d9b78db9d4ab9b20fc7c4d6ff8
+  data.tar.gz: a1bad283f4cd04efa34d8a3d3651e27dca80af88
 SHA512:
-  metadata.gz: 48239da0f9638eac69e7b370a348541e52d8850051917a45cda7cd9ee4977d75ebf41f6a8796df0df93a65fa48a56f9a46409cb87f273061c7bf4cff90b53af9
-  data.tar.gz: c3404b991a0c5bb116672171d93dc48d123dd02c620da40ea274abf6b51ad02475524a8c3a577e75cd9c1c12f8fffc62aa60bf5878dc978e50a835ff3f87f197
+  metadata.gz: 4b0c682b1dfeed43223a616adae8ed7ec6847dc7099f515ea16d0e39f2c295879c652ef36a08e24f6704ca20559614bfb02ab4b04150af296ecd55990cc309b3
+  data.tar.gz: fb9a994b4f8454279e9a3e21a3d0f3faac7cb6b74ffe0a6711b8ba063d5e0208ec2a24960240b33b17291ccc1ffbaadab2f05f71f6a2bff1c075129e9aba2a9c

data/lib/resque/pool/cli.rb

@@ -41,6 +41,7 @@ where [options] are:
           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)"
+          opt :single_process_group, "Workers remain in the same process group as the master", :default => false
         end
         if opts[:daemon]
           opts[:stdout]  ||= "log/resque-pool.stdout.log"
@@ -120,6 +121,7 @@ where [options] are:
         ENV["RACK_ENV"] = ENV["RAILS_ENV"] = ENV["RESQUE_ENV"] = opts[:environment] if opts[:environment]
         Resque::Pool.log "Resque Pool running in #{ENV["RAILS_ENV"] || "development"} environment"
         ENV["RESQUE_POOL_CONFIG"] = opts[:config] if opts[:config]
+        Resque::Pool.single_process_group = opts[:single_process_group]
       end
 
       def start_pool

data/lib/resque/pool/version.rb

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

data/lib/resque/pool.rb

@@ -28,24 +28,31 @@ module Resque
 
     # Config: after_prefork {{{
 
-    # The `after_prefork` hook will be run in workers if you are using the
-    # preforking master worker to save memory. Use this hook to reload
+    # The `after_prefork` hooks will be run in workers if you are using the
+    # preforking master worker to save memory. Use these hooks to reload
     # database connections and so forth to ensure that they're not shared
     # among workers.
     #
-    # Call with a block to set the hook.
-    # Call with no arguments to return the hook.
+    # Call with a block to set a hook.
+    # Call with no arguments to return all registered hooks.
+    #
     def self.after_prefork(&block)
-      block ? (@after_prefork = block) : @after_prefork
+      @after_prefork ||= []
+      block ? (@after_prefork << block) : @after_prefork
     end
 
-    # Set the after_prefork proc.
+    # Sets the after_prefork proc, clearing all pre-existing hooks.
+    # Warning: you probably don't want to clear out the other hooks.
+    # You can use `Resque::Pool.after_prefork << my_hook` instead.
+    #
     def self.after_prefork=(after_prefork)
-      @after_prefork = after_prefork
+      @after_prefork = [after_prefork]
     end
 
     def call_after_prefork!
-      self.class.after_prefork && self.class.after_prefork.call
+      self.class.after_prefork.each do |hook|
+        hook.call
+      end
     end
 
     # }}}
@@ -65,6 +72,15 @@ module Resque
       @handle_winch = bool
     end
 
+    def self.single_process_group=(bool)
+      ENV["RESQUE_SINGLE_PGRP"] = !!bool ? "YES" : "NO"
+    end
+    def self.single_process_group
+      %w[yes y true t 1 okay sure please].include?(
+        ENV["RESQUE_SINGLE_PGRP"].to_s.downcase
+      )
+    end
+
     def self.choose_config_file
       if ENV["RESQUE_POOL_CONFIG"]
         ENV["RESQUE_POOL_CONFIG"]
@@ -380,6 +396,7 @@ module Resque
     def spawn_worker!(queues)
       worker = create_worker(queues)
       pid = fork do
+        Process.setpgrp unless Resque::Pool.single_process_group
         log_worker "Starting worker #{worker}"
         call_after_prefork!
         reset_sig_handlers!
@@ -394,8 +411,12 @@ module Resque
       worker = ::Resque::Worker.new(*queues)
       worker.term_timeout = ENV['RESQUE_TERM_TIMEOUT'] || 4.0
       worker.term_child = ENV['TERM_CHILD']
-      worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
-      worker.very_verbose = ENV['VVERBOSE']
+      if ENV['LOGGING'] || ENV['VERBOSE']
+        worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
+      end
+      if ENV['VVERBOSE']
+        worker.very_verbose = ENV['VVERBOSE']
+      end
       worker
     end
 

data/spec/resque_pool_spec.rb

@@ -6,6 +6,7 @@ RSpec.configure do |config|
     ENV.delete 'RACK_ENV'
     ENV.delete 'RAILS_ENV'
     ENV.delete 'RESQUE_ENV'
+    ENV.delete 'RESQUE_POOL_CONFIG'
   }
 end
 
@@ -164,3 +165,38 @@ describe Resque::Pool, "when loading the pool configuration from a file" do
   end
 
 end
+
+describe Resque::Pool, "given after_prefork hook" do
+  subject { Resque::Pool.new(nil) }
+
+  context "with a single hook" do
+    before { Resque::Pool.after_prefork { @called = true } }
+
+    it "should call prefork" do
+      subject.call_after_prefork!
+      @called.should == true
+    end
+  end
+
+  context "with a single hook by attribute writer" do
+    before { Resque::Pool.after_prefork = Proc.new { @called = true } }
+
+    it "should call prefork" do
+      subject.call_after_prefork!
+      @called.should == true
+    end
+  end
+
+  context "with multiple hooks" do
+    before {
+      Resque::Pool.after_prefork { @called_first = true }
+      Resque::Pool.after_prefork { @called_second = true }
+    }
+
+    it "should call both" do
+      subject.call_after_prefork!
+      @called_first.should == true
+      @called_second.should == true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-pool
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.0.rc2
 platform: ruby
 authors:
 - nicholas a. evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,8 @@ files:
 - spec/resque-pool-custom.yml.erb
 - spec/resque_pool_spec.rb
 homepage: http://github.com/nevans/resque-pool
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []