resque_stuck_queue 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 9a0277c13278dc4044d3da46038e8abf0a1cb44d43ec4acc858e8b2c17519f215468f627a2025e7a680a3d97dc28938314babaf2ac4dc62170afaef0248e63b6
-  data.tar.gz: b7864ee5d7d1e3e185f87f6dd016725016e8595b82c78d9d69a90a7eaf02b3b7a366002859a0c7b1f2d030ebdd5b0d4a4b7adbe7757efe950ff970f1ee48d750
 SHA1: 
-  metadata.gz: 65ce8ea2275ca9e9da2e22178e496b66bcdcc593
-  data.tar.gz: c552ea4b8ae68c03387a62fe83e98b3f8545fcf1
+  data.tar.gz: 45a7b50263556a7d07eaaee7c006033479ba01f2
+  metadata.gz: 8b0c17d7a88388d815317a82502f37f6f57d3a8a
+SHA512: 
+  data.tar.gz: eb8d73f5882b34d63c5cee3cf4cb8bec0e66a2c9b3f30355772042284a93c98bf01357e936fab39904015c5f093588d471af1583daaf8cff6c856870b35fef48
+  metadata.gz: 714f459c5ae47a20353efc148050a2e7957557776110852266688e84d9c3ab36a908831b56a5fde7d18293181569722f925716c1ac7fbd3e0c9b0762bd59648b

data/Gemfile

@@ -1,12 +1,17 @@
 source 'https://rubygems.org'
 
-gem 'resque'
+if ENV['RESQUE_2']
+# resque 2
+  gem 'resque', :git => "https://github.com/engineyard/resque.git"
+else
+  gem 'resque'
+end
+
 gem 'redis-mutex'
 
 # TEST
 gem 'minitest'
 gem 'mocha'
-gem 'resque-mock'
 gem 'pry'
 gem 'rake'
 gem 'm'

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: https://github.com/engineyard/resque.git
+  revision: 2949f9f5b035c59a7c03999c00558544837324b5
+  specs:
+    resque (2.0.0.pre.1)
+      json
+      mono_logger (~> 1.0)
+      redis-namespace (>= 1.3.0)
+      thor (~> 0.17)
+
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.0)
+    json (1.8.1)
     m (1.3.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
@@ -11,14 +22,10 @@ GEM
     mocha (0.14.0)
       metaclass (~> 0.0.1)
     mono_logger (1.1.0)
-    multi_json (1.8.2)
     pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-protection (1.5.1)
-      rack
     rake (10.1.0)
     redis (3.0.6)
     redis-classy (1.2.0)
@@ -27,29 +34,15 @@ GEM
       redis-classy (~> 1.2)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
-    resque (1.25.1)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-mock (0.1.1)
-      resque
     resque-scheduler (2.0.1)
       redis (>= 2.0.1)
       resque (>= 1.20.0)
       rufus-scheduler
     rufus-scheduler (2.0.19)
       tzinfo (>= 0.3.23)
-    sinatra (1.4.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
     slop (3.4.7)
-    tilt (1.4.1)
+    thor (0.18.1)
     tzinfo (0.3.38)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -61,6 +54,5 @@ DEPENDENCIES
   pry
   rake
   redis-mutex
-  resque
-  resque-mock
+  resque!
   resque-scheduler

data/README.md

@@ -47,6 +47,8 @@ Resque::StuckQueue.config[:abort_on_exception] = true
 # optional, pass a logger. Default a ruby logger will be instantiated. Needs to respond to that interface.
 Resque::StuckQueue.config[:logger] = Logger.new($stdout)
 
+# optional, pass a redis. 
+Resque::StuckQueue.config[:redis] = Redis.new
 </pre>
 
 Then start it:

data/lib/resque_stuck_queue.rb

@@ -5,7 +5,6 @@ require 'resque'
 
 # TODO rm redis-mutex dep and just do the setnx locking here
 require 'redis-mutex'
-Redis::Classy.db = Resque.redis
 
 require 'logger'
 
@@ -36,6 +35,9 @@ module Resque
       #
       # # default handler
       # config[:handler] = proc { send_mail }
+      #
+      # # explicit redis
+      # config[:redis] = Redis.new
       def config
         @config ||= {}
       end
@@ -44,6 +46,10 @@ module Resque
         @logger ||= (config[:logger] || Logger.new($stdout))
       end
 
+      def redis
+        @redis ||= (config[:redis] || Resque.redis)
+      end
+
       def start_in_background
         Thread.new do
           Thread.current.abort_on_exception = config[:abort_on_exception]
@@ -58,6 +64,7 @@ module Resque
         @threads = []
         config.freeze
 
+        Redis::Classy.db = redis if Redis::Classy.db.nil?
 
         enqueue_repeating_refresh_job
         setup_checker_thread
@@ -109,8 +116,6 @@ module Resque
           while @running
             # we want to go through resque jobs, because that's what we're trying to test here:
             # ensure that jobs get executed and the time is updated!
-            #
-            # TODO REDIS 2.0 compat
             logger.info("Sending refresh job")
             enqueue_job
             wait_for_it
@@ -122,7 +127,7 @@ module Resque
         if config[:refresh_job]
           config[:refresh_job].call
         else
-          Resque.enqueue(RefreshLatestTimestamp, global_key)
+          Resque.enqueue(RefreshLatestTimestamp, [global_key, redis.client.host, redis.client.port])
         end
       end
 
@@ -158,7 +163,7 @@ module Resque
 
       def manual_refresh
          time = Time.now.to_i
-         Resque.redis.set(global_key, time)
+         redis.set(global_key, time)
          time
       end
 
@@ -171,7 +176,7 @@ module Resque
       end
 
       def read_from_redis
-        Resque.redis.get(global_key)
+        redis.get(global_key)
       end
 
       def wait_for_it
@@ -187,7 +192,11 @@ end
 
 class RefreshLatestTimestamp
   @queue = :app
-  def self.perform(timestamp_key)
-    Resque.redis.set(timestamp_key, Time.now.to_i)
+  def self.perform(args)
+    timestamp_key = args[0]
+    host = args[1] || "localhost"
+    port = args[2] || "6379"
+    r = Redis.new(:host => host, :port => port)
+    r.set(timestamp_key, Time.now.to_i)
   end
 end

data/lib/resque_stuck_queue/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module StuckQueue
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/test/resque/refresh_latest_timestamp.rb

@@ -1,6 +1,8 @@
 class RefreshLatestTimestamp
   @queue = :app
-  def self.perform(timestamp_key)
-    Resque.redis.set(timestamp_key, Time.now.to_i)
+  def self.perform(args)
+    timestamp_key, host, port = args[0], args[1], args[2]
+    r = Redis.new(:host => host, :port => port)
+    r.set(timestamp_key, Time.now.to_i)
   end
 end

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'minitest'
 require "minitest/autorun"
 require 'pry'
 require 'mocha'
-require 'resque/mock'
 $:.unshift(".")
 require 'resque_stuck_queue'
 require File.join(File.expand_path(File.dirname(__FILE__)), "resque", "set_redis_key")

data/test/test_resque_2.rb

@@ -0,0 +1,49 @@
+# run with
+# $ RESQUE_2=1 bi; RESQUE_2=1 be ruby -I. -Ilib/ test/test_resque_2.rb
+if !ENV['RESQUE_2'].nil?
+
+  require 'minitest'
+  require "minitest/autorun"
+  require "pry"
+  require "logger"
+
+  $:.unshift(".")
+  require "resque_stuck_queue"
+  require File.join(File.expand_path(File.dirname(__FILE__)), "resque", "set_redis_key")
+  require File.join(File.expand_path(File.dirname(__FILE__)), "resque", "refresh_latest_timestamp")
+
+  class TestResque2 < Minitest::Test
+
+    def setup
+      assert (Resque::VERSION.match /^2\./), "must run in 2.0"
+      Redis.new.flushall
+    end
+
+   def test_works_with_2_point_oh_do_not_trigger_because_key_is_updated
+
+     Resque.redis = Redis.new
+
+     Resque::StuckQueue.config[:heartbeat] = 1
+     Resque::StuckQueue.config[:abort_on_exception] = true
+     Resque::StuckQueue.config[:trigger_timeout] = 5
+     Resque::StuckQueue.config[:logger] = Logger.new($stdout)
+     Resque::StuckQueue.config[:handler] = proc { Redis.new.incr("test-incr-key") }
+     Resque::StuckQueue.config[:redis] = Redis.new
+
+     #binding.pry
+     Resque::StuckQueue.start_in_background
+
+     @r2_pid = fork { Resque.redis = Redis.new ; Resque::Worker.new("*", :graceful_term => true).work ; Process.waitall }
+     sleep 10
+
+     # did not trigger, resque picked up refresh jobs
+     assert_equal Redis.new.get("test-incr-key").to_i, 0
+
+     `kill #{@r2_pid}`
+     Process.waitall
+     Resque::StuckQueue.force_stop!
+   end
+
+  end
+
+end

data/test/test_resque_stuck_queue.rb

@@ -13,7 +13,6 @@ class TestResqueStuckQueue < Minitest::Test
     puts "#{__method__}"
     # clean previous test runs
     Resque.redis.flushall
-    Resque.mock!
     Resque::StuckQueue.config[:heartbeat]   = 1 # seconds
     Resque::StuckQueue.config[:abort_on_exception] = true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque_stuck_queue
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Shai Rosenfeld
@@ -67,6 +67,7 @@ files:
 - test/test_helper.rb
 - test/test_integration.rb
 - test/test_logger.rb
+- test/test_resque_2.rb
 - test/test_resque_stuck_queue.rb
 - test/test_set_custom_refresh_job.rb
 homepage: https://github.com/shaiguitar/resque_stuck_queue/
@@ -99,5 +100,6 @@ test_files:
 - test/test_helper.rb
 - test/test_integration.rb
 - test/test_logger.rb
+- test/test_resque_2.rb
 - test/test_resque_stuck_queue.rb
 - test/test_set_custom_refresh_job.rb