resque 1.25.1 → 1.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b216a0c5baaf91a99defcfea743121e95944e6
-  data.tar.gz: d05a06e12d5fabc2f2dc248bb4b14807a98f9c30
+  metadata.gz: f2ad41bcdf6fe0f0dac89963978925b803c42a1c
+  data.tar.gz: 7aebfea98597ddfc13f12b408b1df008bfc6b632
 SHA512:
-  metadata.gz: dbf20c331547549a10d6088da69923bf6ff1d06a4cd7562a50298131bdff982984ff6ce2732df0e28d6927b35e6cb82e69638bd4b189a9c0b7983121b5ced64e
-  data.tar.gz: 943655cc279c1d3acd5a154cdc0df8617ef7f82ccc048734f1ff17f1582dd1e2a95b47382f7a0d2d48af327f5c501432cd8297175e99e773e4d19ac5737e20f4
+  metadata.gz: 9a20c5ee3d7808a893574e3fd907c96ed88c510414f5db29a44989ebc2379bb35db8d71ad60cee27a962e6e20d898e2d53657ecdbd08699ab5b6fd17a38df0be
+  data.tar.gz: 8c841e2a57eee4404d669f469055c165885877d74e7f7b4d326099f9e0e74a66c225073ea88c336ac3b69f2406968310b6e12a2b0df2caa7769ccec4a7a46f5a

data/HISTORY.md

@@ -1,3 +1,15 @@
+## 1.25.2 (TBD)
+
+* Respect TERM_CHILD setting when not forking (@ggilder)
+* implementation of backend connection with a hash (Andrea Rossi)
+* require yaml for show_args support (@yaauie)
+* use redis-namespace 1.3 (Andrea Rossi)
+* fix DOCS link in README (@cade)
+* Fix worker prune test to actually run its assertion & cover reality. (@yaauie)
+* Eliminate infinite recursion when Resque::Helpers mixed into Resque (@yaml)
+* use ruby, avoid shelling out. google++ (@hone)
+* Failed Assertions Don't Fail Tests :rage: (@yaauie)
+
 ## 1.25.1 (2013-9-26)
 
 * Actually require Forwardable from the standard library.
@@ -8,7 +20,7 @@
   context (@jonhyman)
 * Use Redis.pipelined to group batches of redis commands.
   https://github.com/resque/resque/pull/902 (@jonhyman)
-* Fixed uninitialize constant for the module/class that contains the perform 
+* Fixed uninitialize constant for the module/class that contains the perform
   method causing job failures to no be reported, #792 (@sideshowcoder)
 * Fix Resque::Failure::Base.all to have the correct signature.
   (@rentalutions)

data/README.markdown

@@ -210,7 +210,7 @@ loop do
   if job = reserve
     job.process
   else
-    sleep 5 # Polling frequency = 5 
+    sleep 5 # Polling frequency = 5
   end
 end
 shutdown
@@ -277,7 +277,7 @@ worker is started.
 
 ### Polling frequency
 
-You can pass an INTERVAL option which is a float representing the polling frequency. 
+You can pass an INTERVAL option which is a float representing the polling frequency.
 The default is 5 seconds, but for a semi-active app you may want to use a smaller value.
 
     $ INTERVAL=0.1 QUEUE=file_serve rake environment resque:work
@@ -818,7 +818,7 @@ sort it out.
 Contributing
 ------------
 
-Read the [Contributing][cb] wiki page first. 
+Read the [Contributing][cb] wiki page first.
 
 Once you've made your great commits:
 
@@ -844,7 +844,7 @@ Meta
 
 * Code: `git clone git://github.com/resque/resque.git`
 * Home: <http://github.com/resque/resque>
-* Docs: <http://resque.github.com/resque/>
+* Docs: <http://rubydoc.info/gems/resque>
 * Bugs: <http://github.com/resque/resque/issues>
 * List: <resque@librelist.com>
 * Chat: <irc://irc.freenode.net/resque>

data/lib/resque.rb

@@ -70,6 +70,7 @@ module Resque
   #   4. A Redis URL String 'redis://host:port'
   #   5. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
   #      or `Redis::Namespace`.
+  #   6. An Hash of a redis connection {:host => 'localhost', :port => 6379, :db => 0}
   def redis=(server)
     case server
     when String
@@ -86,6 +87,8 @@ module Resque
       @redis = Redis::Namespace.new(namespace, :redis => redis)
     when Redis::Namespace
       @redis = server
+    when Hash
+      @redis = Redis::Namespace.new(:resque, :redis => Redis.new(server))
     else
       @redis = Redis::Namespace.new(:resque, :redis => server)
     end
@@ -359,7 +362,7 @@ module Resque
     Plugin.after_dequeue_hooks(klass).each do |hook|
       klass.send(hook, *args)
     end
-    
+
     destroyed
   end
 

data/lib/resque/helpers.rb

@@ -23,6 +23,12 @@ module Resque
 
     # Direct access to the Redis instance.
     def redis
+      # No infinite recursions, please.
+      # Some external libraries depend on Resque::Helpers being mixed into
+      # Resque, but this method causes recursions. If we have a super method,
+      # assume it is canonical. (see #1150)
+      return super if defined?(super)
+
       Resque.redis
     end
 

data/lib/resque/server.rb

@@ -3,6 +3,7 @@ require 'erb'
 require 'resque'
 require 'resque/version'
 require 'time'
+require 'yaml'
 
 if defined? Encoding
   Encoding.default_external = Encoding::UTF_8

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.25.1'
+  Version = VERSION = '1.25.2'
 end

data/lib/resque/worker.rb

@@ -410,10 +410,19 @@ module Resque
     end
 
     # Kill the child and shutdown immediately.
+    # If not forking, abort this process.
     def shutdown!
       shutdown
       if term_child
-        new_kill_child
+        if fork_per_job?
+          new_kill_child
+        else
+          # Raise TermException in the same process
+          trap('TERM') do
+            # ignore subsequent terms
+          end
+          raise TermException.new("SIGTERM")
+        end
       else
         kill_child
       end
@@ -620,7 +629,11 @@ module Resque
     end
 
     def will_fork?
-      !@cant_fork && !$TESTING && (ENV["FORK_PER_JOB"] != 'false')
+      !@cant_fork && !$TESTING && fork_per_job?
+    end
+
+    def fork_per_job?
+      ENV["FORK_PER_JOB"] != 'false'
     end
 
     # Returns a symbol representing the current worker state,
@@ -647,7 +660,7 @@ module Resque
 
     # chomp'd hostname of this machine
     def hostname
-      @hostname ||= `hostname`.chomp
+      Socket.gethostname
     end
 
     # Returns Integer PID of running worker

data/test/job_hooks_test.rb

@@ -283,6 +283,7 @@ context "Resque::Job before_enqueue" do
   end
 
   test "a before enqueue hook that returns false should prevent the job from getting queued" do
+    Resque.remove_queue(:jobs)
     history = []
     @worker = Resque::Worker.new(:jobs)
     assert_nil Resque.enqueue(BeforeEnqueueJobAbort, history)

data/test/test_helper.rb

@@ -89,6 +89,36 @@ module PerformJob
   end
 end
 
+##
+# Helper to make Minitest::Assertion exceptions work properly
+# in the block given to Resque::Worker#work.
+#
+module AssertInWorkBlock
+  # if a block is given, ensure that it is run, and that any assertion
+  # failures that occur inside it propagate up to the test.
+  def work(*args, &block)
+    return super unless block_given?
+
+    ex = catch(:exception_in_block) do
+      block_called = nil
+      retval = super(*args) do |*bargs|
+        begin
+          block_called = true
+          block.call(*bargs)
+        rescue MiniTest::Assertion => ex
+          throw :exception_in_block, ex
+        end
+      end
+
+      raise "assertion block not called!" unless block_called
+
+      return retval
+    end
+
+    ex && raise(ex)
+  end
+end
+
 #
 # fixture classes
 #

data/test/worker_test.rb

@@ -331,13 +331,13 @@ context "Resque::Worker" do
   end
 
   test "inserts itself into the 'workers' list on startup" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert_equal @worker, Resque.workers[0]
     end
   end
 
   test "removes itself from the 'workers' list on shutdown" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert_equal @worker, Resque.workers[0]
     end
 
@@ -345,7 +345,7 @@ context "Resque::Worker" do
   end
 
   test "removes worker with stringified id" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       worker_id = Resque.workers[0].to_s
       Resque.remove_worker(worker_id)
       assert_equal [], Resque.workers
@@ -353,7 +353,7 @@ context "Resque::Worker" do
   end
 
   test "records what it is working on" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       task = @worker.job
       assert_equal({"args"=>[20, "/tmp"], "class"=>"SomeJob"}, task['payload'])
       assert task['run_at']
@@ -367,7 +367,7 @@ context "Resque::Worker" do
   end
 
   test "knows when it is working" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert @worker.working?
     end
   end
@@ -378,7 +378,7 @@ context "Resque::Worker" do
   end
 
   test "knows who is working" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert_equal [@worker], Resque.working
     end
   end
@@ -413,27 +413,27 @@ context "Resque::Worker" do
 
   test "knows when it started" do
     time = Time.now
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert Time.parse(@worker.started) - time < 0.1
     end
   end
 
   test "knows whether it exists or not" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       assert Resque::Worker.exists?(@worker)
       assert !Resque::Worker.exists?('blah-blah')
     end
   end
 
   test "sets $0 while working" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       ver = Resque::Version
-      assert_equal "resque-#{ver}: Processing jobs since #{Time.now.to_i}", $0
+      assert_equal "resque-#{ver}: Processing jobs since #{Time.now.to_i} [SomeJob]", $0
     end
   end
 
   test "can be found" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       found = Resque::Worker.find(@worker.to_s)
       assert_equal @worker.to_s, found.to_s
       assert found.working?
@@ -442,28 +442,50 @@ context "Resque::Worker" do
   end
 
   test "doesn't find fakes" do
-    @worker.work(0) do
+    @worker.extend(AssertInWorkBlock).work(0) do
       found = Resque::Worker.find('blah-blah')
       assert_equal nil, found
     end
   end
 
   test "cleans up dead worker info on start (crash recovery)" do
-    # first we fake out two dead workers
+    # first we fake out several dead workers
+    # 1: matches queue and hostname; gets pruned.
     workerA = Resque::Worker.new(:jobs)
     workerA.instance_variable_set(:@to_s, "#{`hostname`.chomp}:1:jobs")
     workerA.register_worker
 
-    workerB = Resque::Worker.new(:high, :low)
-    workerB.instance_variable_set(:@to_s, "#{`hostname`.chomp}:2:high,low")
+    # 2. matches queue but not hostname; no prune.
+    workerB = Resque::Worker.new(:jobs)
+    workerB.instance_variable_set(:@to_s, "#{`hostname`.chomp}-foo:2:jobs")
     workerB.register_worker
 
-    assert_equal 2, Resque.workers.size
+    # 3. matches hostname but not queue; no prune.
+    workerB = Resque::Worker.new(:high)
+    workerB.instance_variable_set(:@to_s, "#{`hostname`.chomp}:3:high")
+    workerB.register_worker
+
+    # 4. matches neither hostname nor queue; no prune.
+    workerB = Resque::Worker.new(:high)
+    workerB.instance_variable_set(:@to_s, "#{`hostname`.chomp}-foo:4:high")
+    workerB.register_worker
+
+    assert_equal 4, Resque.workers.size
 
     # then we prune them
-    @worker.work(0) do
-      assert_equal 1, Resque.workers.size
-    end
+    @worker.work(0)
+
+    worker_strings = Resque::Worker.all.map(&:to_s)
+
+    assert_equal 3, Resque.workers.size
+
+    # pruned
+    assert !worker_strings.include?("#{`hostname`.chomp}:1:jobs")
+
+    # not pruned
+    assert worker_strings.include?("#{`hostname`.chomp}-foo:2:jobs")
+    assert worker_strings.include?("#{`hostname`.chomp}:3:high")
+    assert worker_strings.include?("#{`hostname`.chomp}-foo:4:high")
   end
 
   test "worker_pids returns pids" do
@@ -899,6 +921,71 @@ context "Resque::Worker" do
       end
     end
 
+    test "exits with Resque::TermException when using TERM_CHILD and not forking" do
+      begin
+        class LongRunningJob
+          @queue = :long_running_job
+
+          def self.perform(run_time)
+            Resque.redis.client.reconnect # get its own connection
+            Resque.redis.rpush('term-exception-test:start', Process.pid)
+            sleep run_time
+            Resque.redis.rpush('term-exception-test:result', 'Finished Normally')
+          rescue Resque::TermException => e
+            Resque.redis.rpush('term-exception-test:result', %Q(Caught TermException: #{e.inspect}))
+          ensure
+            Resque.redis.rpush('term-exception-test:final', 'exiting.')
+          end
+        end
+
+        Resque.enqueue(LongRunningJob, 5)
+
+        worker_pid = Kernel.fork do
+          # reconnect to redis
+          Resque.redis.client.reconnect
+
+          # ensure we don't fork (in worker)
+          $TESTING = false
+          ENV['FORK_PER_JOB'] = 'false'
+
+          worker = Resque::Worker.new(:long_running_job)
+          worker.term_timeout = 1
+          worker.term_child = 1
+
+          worker.work(0)
+          exit!
+        end
+
+        # ensure the worker is started
+        start_status = Resque.redis.blpop('term-exception-test:start', 5)
+        assert_not_nil start_status
+        child_pid = start_status[1].to_i
+        assert_operator child_pid, :>, 0
+
+        # send signal to abort the worker
+        Process.kill('TERM', worker_pid)
+        Process.waitpid(worker_pid)
+
+        # wait to see how it all came down
+        result = Resque.redis.blpop('term-exception-test:result', 5)
+        assert_not_nil result
+        assert !result[1].start_with?('Finished Normally'), 'Job finished normally. Sleep not long enough?'
+        assert result[1].start_with?('Caught TermException'), 'TermException not raised in child.'
+
+        # ensure that the child pid is no longer running
+        child_still_running = !(`ps -p #{child_pid.to_s} -o pid=`).empty?
+        assert !child_still_running
+
+        # see if post-cleanup occurred.
+        post_cleanup_occurred = Resque.redis.lpop( 'term-exception-test:final' )
+        assert post_cleanup_occurred, 'post cleanup did not occur. SIGKILL sent too early?'
+
+      ensure
+        remaining_keys = Resque.redis.keys('term-exception-test:*') || []
+        Resque.redis.del(*remaining_keys) unless remaining_keys.empty?
+      end
+    end
+
     test "displays warning when not using term_child" do
       begin
         $TESTING = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 1.25.1
+  version: 1.25.2
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
@@ -111,70 +111,70 @@ files:
 - LICENSE
 - HISTORY.md
 - lib/resque.rb
-- lib/tasks/redis.rake
 - lib/tasks/resque.rake
+- lib/tasks/redis.rake
+- lib/resque/failure.rb
+- lib/resque/tasks.rb
 - lib/resque/logging.rb
+- lib/resque/failure/airbrake.rb
+- lib/resque/failure/redis.rb
+- lib/resque/failure/redis_multi_queue.rb
+- lib/resque/failure/multiple.rb
+- lib/resque/failure/base.rb
+- lib/resque/helpers.rb
+- lib/resque/log_formatters/quiet_formatter.rb
+- lib/resque/log_formatters/very_verbose_formatter.rb
+- lib/resque/log_formatters/verbose_formatter.rb
+- lib/resque/worker.rb
+- lib/resque/stat.rb
+- lib/resque/vendor/utf8_util/utf8_util_18.rb
+- lib/resque/vendor/utf8_util/utf8_util_19.rb
+- lib/resque/vendor/utf8_util.rb
+- lib/resque/plugin.rb
+- lib/resque/version.rb
+- lib/resque/job.rb
+- lib/resque/server.rb
 - lib/resque/server/test_helper.rb
-- lib/resque/server/public/working.png
-- lib/resque/server/public/jquery.relatize_date.js
-- lib/resque/server/public/ranger.js
-- lib/resque/server/public/reset.css
-- lib/resque/server/public/favicon.ico
-- lib/resque/server/public/poll.png
-- lib/resque/server/public/jquery-1.3.2.min.js
-- lib/resque/server/public/style.css
-- lib/resque/server/public/idle.png
 - lib/resque/server/helpers.rb
-- lib/resque/server/views/next_more.erb
+- lib/resque/server/views/failed_job.erb
+- lib/resque/server/views/overview.erb
+- lib/resque/server/views/error.erb
+- lib/resque/server/views/layout.erb
+- lib/resque/server/views/working.erb
 - lib/resque/server/views/stats.erb
+- lib/resque/server/views/failed_queues_overview.erb
+- lib/resque/server/views/key_string.erb
 - lib/resque/server/views/workers.erb
-- lib/resque/server/views/key_sets.erb
-- lib/resque/server/views/error.erb
 - lib/resque/server/views/failed.erb
+- lib/resque/server/views/key_sets.erb
 - lib/resque/server/views/queues.erb
-- lib/resque/server/views/failed_queues_overview.erb
-- lib/resque/server/views/key_string.erb
-- lib/resque/server/views/failed_job.erb
-- lib/resque/server/views/layout.erb
-- lib/resque/server/views/overview.erb
-- lib/resque/server/views/working.erb
-- lib/resque/stat.rb
-- lib/resque/server.rb
+- lib/resque/server/views/next_more.erb
+- lib/resque/server/public/ranger.js
+- lib/resque/server/public/jquery.relatize_date.js
+- lib/resque/server/public/jquery-1.3.2.min.js
+- lib/resque/server/public/favicon.ico
+- lib/resque/server/public/idle.png
+- lib/resque/server/public/working.png
+- lib/resque/server/public/poll.png
+- lib/resque/server/public/style.css
+- lib/resque/server/public/reset.css
 - lib/resque/errors.rb
-- lib/resque/version.rb
-- lib/resque/vendor/utf8_util/utf8_util_19.rb
-- lib/resque/vendor/utf8_util/utf8_util_18.rb
-- lib/resque/vendor/utf8_util.rb
-- lib/resque/failure/multiple.rb
-- lib/resque/failure/redis_multi_queue.rb
-- lib/resque/failure/base.rb
-- lib/resque/failure/airbrake.rb
-- lib/resque/failure/redis.rb
-- lib/resque/helpers.rb
-- lib/resque/worker.rb
-- lib/resque/job.rb
-- lib/resque/tasks.rb
-- lib/resque/log_formatters/verbose_formatter.rb
-- lib/resque/log_formatters/very_verbose_formatter.rb
-- lib/resque/log_formatters/quiet_formatter.rb
-- lib/resque/failure.rb
-- lib/resque/plugin.rb
 - bin/resque-web
 - bin/resque
-- test/resque_failure_redis_test.rb
-- test/job_plugins_test.rb
-- test/test_helper.rb
-- test/redis-test.conf
+- test/airbrake_test.rb
 - test/plugin_test.rb
+- test/resque_failure_redis_test.rb
 - test/resque_test.rb
-- test/redis-test-cluster.conf
+- test/test_helper.rb
 - test/failure_base_test.rb
-- test/worker_test.rb
-- test/job_hooks_test.rb
+- test/job_plugins_test.rb
+- test/logging_test.rb
+- test/redis-test.conf
 - test/resque-web_test.rb
+- test/job_hooks_test.rb
+- test/worker_test.rb
+- test/redis-test-cluster.conf
 - test/resque_hook_test.rb
-- test/logging_test.rb
-- test/airbrake_test.rb
 homepage: http://github.com/defunkt/resque
 licenses: []
 metadata: {}
@@ -195,8 +195,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Resque is a Redis-backed queueing system.
 test_files: []
+has_rdoc: