resque-ranger 0.1.1 → 0.1.2

data/.gitignore

@@ -19,3 +19,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+
+*.gem

data/README.rdoc

@@ -1,6 +1,6 @@
 = resque-ranger
 
-Description goes here.
+So basically I patched raemon and resque so that it will have on master process that will forks n number of child processes for jobs on the queue. Each worker will still exit after it finishes the job, so you still get the benefits from that aspect of the way resque handles jobs. I eventually plan to switch all of the redis interaction to an evented model and maybe even add fibers. I also plan to add some stats around job execution time so you can keep track of over all performance benefits.
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/resque-ranger

@@ -104,7 +104,7 @@ Choice.options do
     long '--pid_file'
     desc 'Path to the pid file'
     cast String
-    default nil
+    default 'tmp/pids/resque-ranger.pid'
   end
 
   separator ''
@@ -118,8 +118,10 @@ end
 
 ENV['RACK_ENV'] = ENV['RAILS_ENV'] = Choice.choices[:environment]
 
+Resque.redis = Redis.new(Choice.choices[:redis])
+
 Raemon::Runner.queues = Choice.choices[:queues]
-Raemon::Runner.start 5, Resque::Ranger, :detach => @detach,
-                                        :timeout => Choice.choices[:timeout],
-                                        :logger => Choice.choices[:logger],
-                                        :pid_file => Choice.choices[:pid_file]
+Raemon::Runner.start Choice.choices[:workers], Resque::Ranger, :detach => @detach,
+                                              :timeout => Choice.choices[:timeout],
+                                              :logger => Choice.choices[:logger],
+                                              :pid_file => Choice.choices[:pid_file]

data/lib/raemon/runner.rb

@@ -18,5 +18,78 @@ module Raemon
         super
       end
     end
+    
+    # monitors children and receives signals forever
+    # (or until a termination signal is sent).  This handles signals
+    # one-at-a-time time and we'll happily drop signals in case somebody
+    # is signalling us too often.
+    def master_loop!
+      # this pipe is used to wake us up from select(2) in #join when signals
+      # are trapped.  See trap_deferred
+      init_self_pipe!
+      @respawn = true
+
+      QUEUE_SIGS.each { |sig| trap_deferred(sig) }
+      trap(:CHLD) { |sig_nr| awaken_master }
+      
+      process_name 'master'
+      logger.info "master process ready"
+      
+      # Spawn workers for the first time
+      maintain_worker_count
+      
+      begin
+        loop do
+          monitor_memory_usage
+          reap_all_workers
+
+          case SIG_QUEUE.shift
+          when nil
+            murder_lazy_workers
+            maintain_worker_count if @respawn
+            master_sleep
+          when :QUIT # graceful shutdown
+            break
+          when :TERM, :INT # immediate shutdown
+            stop(false)
+            break
+          when :USR1
+            kill_each_worker(:USR1)
+          when :USR2
+            kill_each_worker(:USR2)
+          when :WINCH
+            if Process.ppid == 1 || Process.getpgrp != $$
+              @respawn = false
+              logger.info "gracefully stopping all workers"
+              kill_each_worker(:QUIT)
+            else
+              logger.info "SIGWINCH ignored because we're not daemonized"
+            end
+          when :TTIN
+            @num_workers += 1
+          when :TTOU
+            @num_workers -= 1 if @num_workers > 0
+          when :HUP
+            # TODO: should restart the workers, but a :QUIT could stall
+            # respawn = true
+            # kill_each_worker(:QUIT)
+          end
+        end
+      rescue Errno::EINTR
+        retry
+      rescue => ex
+        logger.error "Unhandled master loop exception #{ex.inspect}."
+        logger.error ex.backtrace.join("\n")
+        retry
+      end
+      
+      # Gracefully shutdown all workers on our way out
+      stop
+      logger.info "master complete"
+      
+      # Close resources
+      unlink_pid_safe(pid_file) if pid_file
+      logger.close
+    end
   end
 end

data/lib/resque/runner.rb

@@ -1,7 +1,7 @@
 module Resque
   class Runner < Worker
     def work(interval = 5, &block)
-      $0 = "resque: Starting"
+      $0 = "resque: Starting - #{Process.pid}"
       startup
 
       if not @paused and job = reserve
@@ -9,7 +9,7 @@ module Resque
         run_hook :before_fork
         working_on job
 
-        procline "Processing #{job.queue} since #{Time.now.to_i}"
+        procline "Processing #{job.queue} since #{Time.now.to_i} - #{Process.pid}"
         perform(job, &block)
         exit! unless @cant_fork
 
@@ -17,7 +17,7 @@ module Resque
         @child = nil
       else
         break if interval.to_i == 0
-        log! "Sleeping for #{interval.to_i}"
+        log! "Sleeping for #{interval.to_i} - #{Process.pid}"
         procline @paused ? "Paused" : "Waiting for #{@queues.join(',')}"
         sleep interval.to_i
       end

data/resque-ranger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resque-ranger}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["brianthecoder"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-06-02}
   s.default_executable = %q{resque-ranger}
   s.description = %q{Super fast evented daemon to process resque jobs, some built in job metrics too, just cause your app might not be on 1.9.1, your bot might be able to}
   s.email = %q{wbsmith83@gmail.com}
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/BrianTheCoder/resque-ranger}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Super fast evented daemon to process resque jobs, some built in job metrics too}
   s.test_files = [
     "test/helper.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, ["= 1.0.4"])
       s.add_runtime_dependency(%q<resque>, ["= 1.8.0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-ranger
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - brianthecoder
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 -05:00
+date: 2010-06-02 00:00:00 -05:00
 default_executable: resque-ranger
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: redis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 0
@@ -47,9 +52,11 @@ dependencies:
   name: resque
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 1
         - 8
@@ -61,9 +68,11 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 0
         - 12
@@ -105,23 +114,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Super fast evented daemon to process resque jobs, some built in job metrics too