resque-pool 0.0.7 → 0.0.8

data/README.md

@@ -2,9 +2,8 @@ Resque Pool
 ===========
 
 Resque pool is a simple library for managing a pool of resque workers.  Given a
-a config file (`resque-pool.yml` or `config/resque-pool.yml`) or a config hash,
-it will manage your workers for you, starting up the appropriate number of
-workers for each.
+a config file (`resque-pool.yml` or `config/resque-pool.yml`), it will manage
+your workers for you, starting up the appropriate number of workers for each.
 
 Benefits
 ---------
@@ -23,8 +22,8 @@ How to use
 -----------
 
 To configure resque-pool, you can use either `resque-pool.yml` or
-`config/resque-pool.yml`.  To use resque-pool, require its rake tasks in your
-rake file, and call the resque:pool task.
+`config/resque-pool.yml`.  To use resque-pool, require its rake tasks
+(`resque/pool/tasks`) in your rake file, and call the `resque:pool` task.
 
 The YAML file supports both using root level defaults as well as environment
 specific overrides.  For example, to use resque-pool with rails, in
@@ -32,63 +31,49 @@ specific overrides.  For example, to use resque-pool with rails, in
 
     foo: 1
     bar: 2
-    "foo,bar,baz": 4
+    "foo,bar,baz": 1
 
     production:
-      "foo,bar,baz": 10
+      "foo,bar,baz": 4
 
 and in `lib/tasks/resque.rake`:
 
     require 'resque/pool/tasks'
-
     # this task will get called before resque:pool:setup
     # preload the rails environment in the pool master
     task "resque:setup" => :environment do
       # generic worker setup, e.g. Hoptoad for failed jobs
     end
-
-    # preload the rails environment in the pool master
     task "resque:pool:setup" do
       # close any sockets or files in pool master
       ActiveRecord::Base.connection.disconnect!
-
       # and re-open them in the resque worker parent
       Resque::Pool.after_prefork do |job|
         ActiveRecord::Base.establish_connection
       end
-
-      # you could also re-open them in the resque worker child, using
-      # Resque.after_fork, but that probably isn't necessary, and
-      # Resque::Pool.after_prefork should be faster, since it won't run
-      # for every single job.
     end
 
 Then you can start the queues via:
 
     rake resque:pool RAILS_ENV=production VERBOSE=1
 
-This will start up seven worker processes, one each looking exclusively at each
-of the foo, bar, and baz queues, and four workers looking at all queues in
+This will start up seven worker processes, one exclusively for the foo queue,
+two exclusively for the bar queue, and four workers looking at all queues in
 priority.  This is similar to if you ran the following:
 
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=bar
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=bar
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz
-    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz
-
-Resque already forks for its own child processes, giving two levels.  The pool
-master will stay around monitoring the resque worker parents, giving three
-levels:
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=bar &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=bar &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz &
+    rake resque:work RAILS_ENV=production VERBOSE=1 QUEUES=foo,bar,baz &
 
-* a single pool master
-* many worker parents
-* a worker child per worker (when the actual job is being processed)
-
-For example, `ps -ef f | grep [r]esque` might return something like the
-following:
+Resque already forks for its own child processes.  The pool master will stay
+around monitoring the resque worker parents, giving three levels: a single pool
+master, many worker parents, and a worker child per worker (when the actual job
+is being processed).  For example, `ps -ef f | grep [r]esque` (in Linux) might
+return something like the following:
 
     rails    13858     1  0 13:44 ?        S      0:02 resque-pool-master: managing [13867, 13875, 13871, 13872, 13868, 13870, 13876]
     rails    13867 13858  0 13:44 ?        S      0:00  \_ resque-1.9.9: Waiting for foo
@@ -101,6 +86,9 @@ following:
     rails    13876 13858  0 13:44 ?        S      0:00  \_ resque-1.9.9: Forked 7485 at 1280343255
     rails     7485 13876  0 14:54 ?        S      0:00      \_ resque-1.9.9: Processing bar since 1280343254
 
+An example startup script, which redirects STDOUT and STDERR and creates a pid
+file, is given in the examples directory.
+
 SIGNALS
 -------
 
@@ -113,9 +101,8 @@ The pool master responds to the following signals:
 * `WINCH` - send `QUIT` to each worker, but keep master running (send `HUP` to reload config and restart workers)
 * `USR1`/`USR2`/`CONT` - send the signal on to all worker parents (see Resque docs).
 
-`HUP` will no-op if you use a hash for configuration instead of a config file.
-So you should probably use a config file.  After a `HUP`, workers that are no
-longer needed will be gracefully shutdown via `QUIT`.
+After a `HUP`, workers that are no longer needed will be gracefully shutdown
+via `QUIT`.
 
 Other Features
 --------------

data/lib/resque/pool.rb

@@ -79,16 +79,12 @@ module Resque
     end
 
     def load_config
-      if @config_file
-        @config = YAML.load_file(@config_file)
-      end
-      if config_environment
-        config.merge!(@config[config_environment])
-      end
+      @config_file         and @config = YAML.load_file(@config_file)
+      @config[environment] and config.merge!(@config[environment])
       config.delete_if {|key, value| value.is_a? Hash }
     end
 
-    def config_environment
+    def environment
       if defined? RAILS_ENV
         RAILS_ENV
       else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-pool
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - nicholas a. evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -04:00
+date: 2010-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency