resque 1.27.1 → 1.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1daac3d258fab0d2df0f3b9c8fd8a65ccbc2c885
-  data.tar.gz: 88d64df16da1b0312bdd314f46e9a8776d787c13
+  metadata.gz: c9757198382c0b8e5cf383fc49fe82ce4f59933e
+  data.tar.gz: 6dbda5f17bf9cb44f99c18724b0cb6a6e1422e73
 SHA512:
-  metadata.gz: 834bcae49f7c471737d6ceb360162a830b403d2ca36c099cee05d5d2a8c24f163bbfeb101080042e023351a34c2007f63dd1f6e19da8847d9487d8743977029a
-  data.tar.gz: cf65256fb4d939ebed384ca9cd1e6a30eef611167bfaa3abeb427f79f5cf005f79c9d85146a4dbe7cec429bbdaff27c04a802c7993acbfb4477a832314f84fb2
+  metadata.gz: 45cc843a75953f9b5e08ebcded0caafa7da8a833489d6c48922b68d6fecc3192ddd4dbce3f77dffc45cf187a89e6a1e79509a2043e9ce11081996e8466561d75
+  data.tar.gz: 6d5c2fdc451fd17b50b1d82a7f7ed94a25aad40af6cc0515e0cace4304944b0539fee3cc42c64a8608db64135fec5d79db0f9fb6c5f1d13531794923078c4f96

data/HISTORY.md

@@ -2,6 +2,12 @@
 
 Nothing yet!
 
+## 1.27.2 (2017-02-20)
+
+### Fixed
+* Require "redis/distributed" in worker.rb to allow proper rescuing
+* Fallback to server time if Redis time won't work (restores Redis 2.4 support)
+
 ## 1.27.1 (2017-02-13)
 
 ### Fixed

data/README.markdown

@@ -195,7 +195,7 @@ We plan to provide first class `async` support in a future release.
 
 If a job raises an exception, it is logged and handed off to the
 `Resque::Failure` module. Failures are logged either locally in Redis
-or using some different backend. To see exceptions while developing, 
+or using some different backend. To see exceptions while developing,
 use VERBOSE env variable, see details below under Logging.
 
 For example, Resque ships with Airbrake support. To configure it, put
@@ -634,6 +634,13 @@ require 'your/app'
 require 'resque/tasks'
 ```
 
+If you're using Rails 5.x, include the following in lib/tasks/resque.rb:
+
+```ruby
+require 'resque/tasks'
+task 'resque:setup' => :environment
+```
+
 Now:
 
     $ QUEUE=* rake resque:work

data/lib/resque/data_store.rb

@@ -7,11 +7,12 @@ module Resque
     HEARTBEAT_KEY = "workers:heartbeat"
 
     def initialize(redis)
-      @redis               = redis
-      @queue_access        = QueueAccess.new(@redis)
-      @failed_queue_access = FailedQueueAccess.new(@redis)
-      @workers             = Workers.new(@redis)
-      @stats_access        = StatsAccess.new(@redis)
+      @redis                = redis
+      @queue_access         = QueueAccess.new(@redis)
+      @failed_queue_access  = FailedQueueAccess.new(@redis)
+      @workers              = Workers.new(@redis)
+      @stats_access         = StatsAccess.new(@redis)
+      @redis_time_available = redis_time_available?
     end
 
     def_delegators :@queue_access, :push_to_queue,
@@ -91,10 +92,17 @@ module Resque
     end
 
     def server_time
-      time, _ = @redis.time
+      time, _ = @redis_time_available ? @redis.time : Time.now
       Time.at(time)
     end
 
+    def redis_time_available?
+      @redis.time
+    rescue Redis::CommandError
+      false
+    end
+    private :redis_time_available?
+
     class QueueAccess
       def initialize(redis)
         @redis = redis
@@ -299,7 +307,6 @@ module Resque
       def redis_key_for_worker_start_time(worker)
         "#{redis_key_for_worker(worker)}:started"
       end
-
     end
 
     class StatsAccess

data/lib/resque/server/public/style.css

@@ -8,7 +8,7 @@ body { padding:0; margin:0; }
 .header ul li a:hover { background:#333;}
 .header ul li.current a { background:#ce1212; font-weight:bold; color:#fff;}
 
-.header .namespace { position: absolute; right: 75px; top: 10px; color: #7A7A7A; }
+.header .namespace { position: absolute; right: 75px; top: 12px; color: #FFF; font-weight: bold; }
 
 .subnav { padding:2px 5% 7px 5%; background:#ce1212; font-size:90%;}
 .subnav li { display:inline;}
@@ -88,4 +88,4 @@ body { padding:0; margin:0; }
 
 #failed tr.total td {background-color: #FFECEC; color: #D37474; font-size: 15px; font-weight: bold;}
 #failed .center {text-align: center;}
-#failed .failed_class { padding-left: 20px; font-size:12px; }
+#failed .failed_class { padding-left: 20px; font-size:12px; }

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.27.1'
+  Version = VERSION = '1.27.2'
 end

data/lib/resque/worker.rb

@@ -1,5 +1,6 @@
 require 'time'
 require 'set'
+require 'redis/distributed'
 
 module Resque
   # A Resque Worker processes jobs. On platforms that support fork(2),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 1.27.1
+  version: 1.27.2
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Resque is a Redis-backed queueing system.