resque-pool 0.0.8 → 0.0.9

data/README.md

@@ -26,8 +26,9 @@ To configure resque-pool, you can use either `resque-pool.yml` or
 (`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
-`config/resque-pool.yml`:
+specific overrides (`RACK_ENV`, `RAILS_ENV`, and `RESQUE_ENV` environment
+variables will be used to determine environment).  For example, to use
+resque-pool with rails, in `config/resque-pool.yml`:
 
     foo: 1
     bar: 2
@@ -110,6 +111,11 @@ Other Features
 Workers will watch the pool master, and gracefully shutdown if the master
 process dies (for whatever reason) before them.
 
+You can specify an alternate config file by setting the `RESQUE_POOL_CONFIG`
+environment variable like so:
+
+    rake resque:pool RESQUE_ENV=production RESQUE_POOL_CONFIG=/path/to/my/config.yml
+
 TODO
 -----
 

data/lib/resque/pool/pooled_worker.rb

@@ -11,55 +11,11 @@ class Resque::Pool
       @pool_master_pid && @pool_master_pid != Process.ppid
     end
 
-    # this allows us to shutdown
+    # override +shutdown?+ method
     def shutdown?
-      @shutdown || pool_master_has_gone_away?
+      super || pool_master_has_gone_away?
     end
 
-    # this entire method (except for one line) is copied and pasted from
-    # resque-1.9.10.  If shutdown were used as a method (attr_reader) rather
-    # than an instance variable, I wouldn't need to reduplicate this. :-(
-    #
-    # hopefully I can get defunkt to accept my patch for this.
-    # Until it is, the resque-pool gem will depend on an exact version of
-    # resque.
-    def work(interval = 5, &block)
-      $0 = "resque: Starting"
-      startup
-
-      loop do
-        #### THIS IS THE ONLY LINE THAT IS CHANGED
-        break if shutdown?
-        #### THAT WAS THE ONLY LINE THAT WAS CHANGED
-
-        if not @paused and job = reserve
-          log "got: #{job.inspect}"
-          run_hook :before_fork, job
-          working_on job
-
-          if @child = fork
-            rand # Reseeding
-            procline "Forked #{@child} at #{Time.now.to_i}"
-            Process.wait
-          else
-            procline "Processing #{job.queue} since #{Time.now.to_i}"
-            perform(job, &block)
-            exit! unless @cant_fork
-          end
-
-          done_working
-          @child = nil
-        else
-          break if interval.to_i == 0
-          log! "Sleeping for #{interval.to_i}"
-          procline @paused ? "Paused" : "Waiting for #{@queues.join(',')}"
-          sleep interval.to_i
-        end
-      end
-
-    ensure
-      unregister_worker
-    end
   end
 
 end

data/lib/resque/pool.rb

@@ -51,15 +51,19 @@ module Resque
 
     @config_files = ["resque-pool.yml", "config/resque-pool.yml"]
     class << self; attr_accessor :config_files; end
-    def self.load_default_config
-      @config_files.detect { |f| File.exist?(f) }
+    def self.choose_config_file
+      if ENV["RESQUE_POOL_CONFIG"]
+        ENV["RESQUE_POOL_CONFIG"]
+      else
+        @config_files.detect { |f| File.exist?(f) }
+      end
     end
 
     def self.run
       if GC.respond_to?(:copy_on_write_friendly=)
         GC.copy_on_write_friendly = true
       end
-      Resque::Pool.new(load_default_config).start.join
+      Resque::Pool.new(choose_config_file).start.join
     end
 
     # }}}
@@ -79,8 +83,8 @@ module Resque
     end
 
     def load_config
-      @config_file         and @config = YAML.load_file(@config_file)
-      @config[environment] and config.merge!(@config[environment])
+      @config_file and @config = YAML.load_file(@config_file)
+      environment and @config[environment] and config.merge!(@config[environment])
       config.delete_if {|key, value| value.is_a? Hash }
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-pool
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - nicholas a. evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,14 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 27
         segments: 
         - 1
-        - 9
         - 10
-        version: 1.9.10
+        version: "1.10"
   type: :runtime
   version_requirements: *id002
 description: "    quickly and easily fork a pool of resque workers,\n    saving memory (w/REE) and monitoring their uptime\n"