resque-igo 1.12.7 → 1.12.8

data/HISTORY.md

@@ -1,3 +1,11 @@
+## 1.12.0 (2011-02-03)
+
+* Added pidfile writing from `rake resque:work`
+* Added Worker#pid method
+* Bugfix: Errors in failure backend are rescue'd
+* Bugfix: Non-working workers no longer counted in "working" count
+* Bugfix: Don't think resque-web is a worker
+
 ## 1.11.0 (2010-08-23)
 
 * Web UI: Group /workers page by hostnames

data/README.markdown

@@ -295,6 +295,13 @@ variable.
 
     $ VVERBOSE=1 QUEUE=file_serve rake environment resque:work
 
+### Process IDs (PIDs)
+
+There are scenarios where it's helpful to record the PID of a resque
+worker process.  Use the PIDFILE option for easy access to the PID:
+
+    $ PIDFILE=./resque.pid QUEUE=file_serve rake environment resque:work
+
 
 ### Priorities and Queue Lists
 

data/Rakefile

@@ -21,7 +21,6 @@ desc "Run the test suite"
 task :test do
   rg = command?(:rg)
   Dir['test/**/*_test.rb'].each do |f|
-    #rg ? sh("rg #{f}") : ruby(f)
     ruby(f)
   end
 end

data/lib/resque/tasks.rb

@@ -8,7 +8,6 @@ namespace :resque do
   task :work => :setup do
     require 'resque'
 
-    worker = nil
     queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
 
     begin
@@ -19,6 +18,10 @@ namespace :resque do
       abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
     end
 
+    if ENV['PIDFILE']
+      File.open(ENV['PIDFILE'], 'w') { |f| f << Process.pid.to_s }
+    end
+
     worker.log "Starting worker #{worker}"
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.12.7'
+  Version = VERSION = '1.12.8'
 end

data/lib/resque/worker.rb

@@ -68,7 +68,7 @@ module Resque
     # in alphabetical order. Queues can be dynamically added or
     # removed without needing to restart workers using this method.
     def initialize(*queues)
-      @queues = queues
+      @queues = queues.map { |queue| queue.to_s.strip }
       validate_queues
     end
 
@@ -152,7 +152,11 @@ module Resque
         job.perform
       rescue Object => e
         log "#{job.inspect} failed: #{e.inspect}"
-        job.fail(e)
+        begin
+          job.fail(e)
+        rescue Object => e
+          log "Received exception when reporting failure: #{e.inspect}"
+        end
         failed!
       else
         log "done: #{job.inspect}"
@@ -173,6 +177,10 @@ module Resque
       end
 
       nil
+    rescue Exception => e
+      log "Error reserving job: #{e.inspect}"
+      log e.backtrace.join("\n")
+      raise e
     end
 
     # Returns a list of queues to use when searching for a job.
@@ -435,7 +443,7 @@ module Resque
     # The string representation is the same as the id for this worker
     # instance. Can be used with `Worker.find`.
     def to_s
-      @to_s ||= "#{hostname}:#{Process.pid}:#{@queues.join(',')}"
+      @to_s ||= "#{hostname}:#{pid}:#{@queues.join(',')}"
     end
     alias_method :id, :to_s
 
@@ -444,10 +452,15 @@ module Resque
       @hostname ||= `hostname`.chomp
     end
 
+    # Returns PID of running worker
+    def pid
+      @pid ||= Process.pid
+    end
+
     # Returns an array of string pids of all the other workers on this
     # machine. Useful when pruning dead workers on startup.
     def worker_pids
-      `ps -A -o pid,command | grep [r]esque`.split("\n").map do |line|
+      `ps -A -o pid,command | grep [r]esque | grep -i "resque-web"`.split("\n").map do |line|
         line.split(' ')[0]
       end
     end

data/test/job_hooks_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 context "Resque::Job before_perform" do
   include PerformJob

data/test/job_plugins_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 context "Multiple plugins with multiple hooks" do
   include PerformJob

data/test/plugin_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 context "Resque::Plugin finding hooks" do
   module SimplePlugin

data/test/resque-web_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'resque/server/test_helper'
  
 # Root path test

data/test/resque_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 context "Resque" do
   setup do

data/test/test_helper.rb

@@ -94,7 +94,6 @@ class NonUnique
   def self.perform(data)
     "I has a #{data}"
   end
-
 end
 
 class OtherUnique
@@ -134,6 +133,20 @@ class UniqueHydraJob
   @hydra = 100
 end
 
+class BadFailureBackend < Resque::Failure::Base
+  def save
+    raise Exception.new("Failure backend error")
+  end
+end
+
+def with_failure_backend(failure_backend, &block)
+  previous_backend = Resque::Failure.backend
+  Resque::Failure.backend = failure_backend
+  yield block
+ensure
+  Resque::Failure.backend = previous_backend
+end
+
 #some redgreen fun
 # -*- coding: utf-8 -*-
 begin
@@ -179,6 +192,4 @@ begin
   end
 rescue LoadError
   puts "consider gem install redgreen"
-end
-
-
+end

data/test/worker_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 context "Resque::Worker" do
   setup do
@@ -24,6 +24,13 @@ context "Resque::Worker" do
     assert_equal('Extra Bad job!', failure['error'])
   end
 
+  test "does not allow exceptions from failure backend to escape" do
+    job = Resque::Job.new(:jobs, {})
+    with_failure_backend BadFailureBackend do
+      @worker.perform job
+    end
+  end
+
   test "fails uncompleted jobs on exit" do
     job = Resque::Job.new(:jobs, ['GoodJob', "blah"])
     @worker.working_on(job)
@@ -56,6 +63,12 @@ context "Resque::Worker" do
     assert_equal 2, Resque::Failure.count
   end
 
+  test "strips whitespace from queue names" do
+    queues = "critical, high, low".split(',')
+    worker = Resque::Worker.new(*queues)
+    assert_equal %w( critical high low ), worker.queues
+  end
+
   test "can work on multiple queues" do
     Resque::Job.create(:high, GoodJob)
     Resque::Job.create(:critical, GoodJob)
@@ -301,4 +314,8 @@ context "Resque::Worker" do
     workerA.work(0)
     assert $AFTER_FORK_CALLED
   end
+
+  test "returns PID of running process" do
+    assert_equal Process.pid, @worker.pid
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-igo
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 55
   prerelease: false
   segments: 
   - 1
   - 12
-  - 7
-  version: 1.12.7
+  - 8
+  version: 1.12.8
 platform: ruby
 authors: 
 - Nathan D Acuff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -05:00
+date: 2011-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency