resque-forker 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,4 +1,16 @@
-2010-09-07 v1.2 Capistrano role is worker, not workers
+2010-09-16 v1.3 Show command in Resque console, USR1 dumps to syslog
+
+Resque console now shows forker script command (look for 'script'). This will
+help you determine which version is running, e.g.  .../current/script/worker is
+latest, whereas .../releases/20100916/script/worker will get stuck on this
+release when you reload.
+
+Experimental: send USR1 single to have Resque::Forker dump Resque statistics,
+queue and worker lists to Syslog. You can then enjoy the glory of checking
+status from the command line:
+
+  kill -USR1 <pid>
+	tail /var/log/syslog.log
 
 2010-09-06 v1.2 Capistrano task and script/trigger
 

data/README.rdoc

@@ -79,7 +79,7 @@ master process, which will propagate them to all workers:
 
   kill -QUIT -- Quit gracefully
   kill -TERM -- Terminate immediately
-  kill -USR1 -- Stop any ongoing job
+  kill -USR1 -- Dump status to syslog
   kill -USR2 -- Suspend worker
   kill -CONT -- Resume suspended worker
 
@@ -181,6 +181,15 @@ that doesn't have your regular account settings:
 
   $ env -i sudo /bin/bash --norc --noprofile
 
+Also, make sure your script is running from the current directory. Say the
+script path as shown in the Resque console is
+/var/www/myapp/current/script/worker: reloading this script will load the most
+recent version of your application.
+
+On the other hand, if the script path looks like
+/var/www/myapp/releases/20100916, reloading this script will reload the same
+release over and over.
+
 
 == Credits
 

data/Rakefile

@@ -26,3 +26,7 @@ end
 YARD::Rake::YardocTask.new do |doc|
   doc.files = FileList["lib/**/*.rb"]
 end
+
+task :clobber do
+  rm_rf %w{doc .yardoc}
+end

data/etc/init/workers.conf

@@ -0,0 +1,16 @@
+#!upstart
+description "redis"
+
+start on runlevel [2345]
+stop on runlevel [06]
+
+# Change this to your application's path
+env RACK_ENV=production
+
+# Using system Ruby
+exec /var/www/app/current/script/workers
+# Using system-wide RVM (assumes rvm wrapper <ver> app ruby)
+# exec app_ruby /var/www/app/current/script/workers
+
+respawn
+normal exit 0 TERM QUIT

data/lib/resque/forker.rb

@@ -1,5 +1,6 @@
 require "logger"
 require "resque"
+require "syslog"
 
 module Resque
   # Loading Rails, the application and all its dependencies takes significant time
@@ -62,6 +63,8 @@ module Resque
   #   respawn
   class Forker
 
+    VERSION = "1.3.0"
+
     Options = Struct.new(:verbose, :very_verbose, :interval, :terminate)
 
     def initialize(options = nil)
@@ -133,7 +136,7 @@ module Resque
         exit
       end
       # Pause/continue processing
-      trap(:USR1) { Process.kill :USR1, *@children }
+      trap(:USR1) { dump }
       trap(:USR2) { Process.kill :USR2, *@children }
       trap(:CONT) { Process.kill :CONT, *@children }
       # Reincarnate. Stop children, and reload binary (application and all)
@@ -203,6 +206,25 @@ module Resque
       exit!
     end
 
+    def dump
+      Syslog.open "resque-forker" unless Syslog.opened?
+      Syslog.notice "STATUS:"
+      for key, value in Resque.info.to_a.sort_by { |i| i[0].to_s }
+        Syslog.notice "%20s: %s" % [key, value]
+      end
+      Syslog.notice "QUEUES:"
+      for queue in Resque.queues.sort_by { |q| q.to_s }
+        Syslog.notice "%20s: %d" % [queue, Resque.size(queue)]
+      end
+      Syslog.notice "WORKERS:"
+      for worker in (workers = Resque.workers.sort_by { |w| w.to_s })
+        Syslog.notice "%40s: %s" % [worker, worker.state]
+      end
+      Syslog.notice "There are no registered workers" if workers.empty?
+    rescue
+      Syslog.err $!
+    end
+
   end
 
   
@@ -242,4 +264,13 @@ module Resque
   def fork!(options = nil)
     Resque::Forker.new(options).run
   end
+
+  # Have Resque console show the command/arguments.
+  alias :info_without_forker :info
+  def info
+    hash = info_without_forker
+    hash[:script] = ([$0] + ARGV).map { |a| a[/[\s"]/] ? a.inspect : a }.join(" ")
+    hash
+  end
+  
 end

data/resque-forker.gemspec

@@ -1,13 +1,17 @@
+$: << File.dirname(__FILE__) + "/lib"
+require "resque/forker"
+
 Gem::Specification.new do |spec|
   spec.name           = "resque-forker"
-  spec.version        = "1.2.1"
+  spec.version        = Resque::Forker::VERSION
   spec.author         = "Assaf Arkin"
   spec.email          = "assaf@labnotes.org"
   spec.homepage       = "http://github.com/flowtown/resque-forker"
   spec.summary        = "Super awesome forking action for Resque workers"
+  spec.description    = "Use the power of forking to run multiple Resque workers."
   spec.post_install_message = ""
 
-  spec.files          = Dir["{lib,script}/**/*", "CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "*.gemspec"]
+  spec.files          = Dir["{lib,script,etc}/**/*", "CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "*.gemspec"]
 
   spec.has_rdoc         = true
   spec.extra_rdoc_files = "README.rdoc", "CHANGELOG"

data/script/workers

@@ -25,3 +25,4 @@ Resque.before_first_fork do
   ActiveRecord::Base.establish_connection
 end
 Resque.fork!
+puts "here"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-forker
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2010-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: 
+description: Use the power of forking to run multiple Resque workers.
 email: assaf@labnotes.org
 executables: []
 
@@ -46,6 +46,7 @@ files:
 - lib/resque/forker.rb
 - script/trigger
 - script/workers
+- etc/init/workers.conf
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
@@ -58,7 +59,7 @@ licenses: []
 post_install_message: ""
 rdoc_options: 
 - --title
-- Resque Forker  1.2.1
+- Resque Forker  1.3.0
 - --main
 - README.rdoc
 - --webcvs