resque-scheduler 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0ce99a734298a549762b23f47785be5667966a
-  data.tar.gz: 6afeb5b9d56d492974e546a5f02b07e5a187de29
+  metadata.gz: 62efe393e6b613cf1d08a9d757105c124976010d
+  data.tar.gz: 9e61be4df36fa45b2e46ce09b97d8460481bf814
 SHA512:
-  metadata.gz: ca01e37f6f95d63381c991e15334886882b1a0ec3808235fc8d4e2b388c2fb27540d5656900e5b65a73b199436d638b393ec02431a198ce338407a7490f2e776
-  data.tar.gz: 84d9c9d293009c89ddbb7362d1741ceef87f74fd31636c1631c7a1ce731eb4fbf118263f92ab2af393dfd3898fb8de6ec94bbf208940ed15213c07104c974442
+  metadata.gz: 031282aff18c1d4ed4b57b906190adcae00c303cfa50ef66cbe6823761da44180194e64f15d5e81474486092e71a86d24d258294092dc00b2da5f2a27bd26024
+  data.tar.gz: 310937e91fd414c72d95f5394e9dd38090a6e291ba94b78cbab470e5ca9dd92c8365853c0244460e0934cafbac43835fe97adcc0c6de63d4c3eecee5737dac48

data/HISTORY.md

@@ -1,5 +1,11 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 2.5.5 (2014-02-27)
+* Only showing link to job with args if job is present
+* Only showing scheduled jobs that match current env or omit env
+* Ensuring lock and acquire lua scripts are refreshed on timeout change
+* Switch to using `mono_logger` instead of stdlib `logger`
+
 ## 2.5.4 (2014-02-17)
 * Documentation updates
 

data/README.md

@@ -145,9 +145,9 @@ scheduled job must run (coerced with `Kernel#Float()`) (default `5`)
 default `'text'`)
 * `PIDFILE` - If non-empty, write process PID to file (default empty)
 * `QUIET` or `MUTE` - Silence most output if non-empty (equivalent to
-a level of `Logger::FATAL`, default `false`)
+a level of `MonoLogger::FATAL`, default `false`)
 * `VERBOSE` - Maximize log verbosity if non-empty (equivalent to a level
-of `Logger::DEBUG`, default `false`)
+of `MonoLogger::DEBUG`, default `false`)
 
 
 ### Resque Pool integration 

data/lib/resque/scheduler/lock/resilient.rb

@@ -20,6 +20,15 @@ module Resque
           ).to_i == 1
         end
 
+        def timeout=(seconds)
+          if locked?
+            @timeout = seconds
+            @locked_sha = nil
+            @acquire_sha = nil
+          end
+          @timeout
+        end
+
         private
 
         def locked_sha(refresh = false)

data/lib/resque_scheduler/logger_builder.rb

@@ -1,5 +1,7 @@
 # vim:fileencoding=utf-8
 
+require 'mono_logger'
+
 module ResqueScheduler
   # Just builds a logger, with specified verbosity and destination.
   # The simplest example:
@@ -26,9 +28,9 @@ module ResqueScheduler
       @format = opts[:format] || 'text'
     end
 
-    # Returns an instance of Logger
+    # Returns an instance of MonoLogger
     def build
-      logger = Logger.new(@log_dev)
+      logger = MonoLogger.new(@log_dev)
       logger.level = level
       logger.formatter = send(:"#{@format}_formatter")
       logger
@@ -38,11 +40,11 @@ module ResqueScheduler
 
     def level
       if @verbose && !@muted
-        Logger::DEBUG
+        MonoLogger::DEBUG
       elsif !@muted
-        Logger::INFO
+        MonoLogger::INFO
       else
-        Logger::FATAL
+        MonoLogger::FATAL
       end
     end
 

data/lib/resque_scheduler/server.rb

@@ -82,6 +82,11 @@ module ResqueScheduler
               config['class']
             end
           end
+
+          def scheduled_in_this_env?(name)
+            return true if Resque.schedule[name]['rails_env'].nil?
+            Resque.schedule[name]['rails_env'] == Resque::Scheduler.env
+          end
         end
 
         get "/schedule" do

data/lib/resque_scheduler/server/views/delayed.erb

@@ -40,7 +40,11 @@
         <% end %>
       </td>
       <td><%= h(job['args'].inspect) if job && delayed_timestamp_size == 1 %></td>
-      <td><a href="<%=u URI("/delayed/jobs/#{job['class']}?args=" + URI.encode(job['args'].to_json)) %>">All schedules</a></td>
+      <td>
+        <% if job %>
+          <a href="<%=u URI("/delayed/jobs/#{job['class']}?args=" + URI.encode(job['args'].to_json)) %>">All schedules</a>
+        <% end %>
+      </td>
     </tr>
   <% end %>
 </table>

data/lib/resque_scheduler/server/views/scheduler.erb

@@ -16,7 +16,7 @@
     <th>Queue</th>
     <th>Arguments</th>
   </tr>
-  <% Resque.schedule.keys.sort.each do |name| %>
+  <% Resque.schedule.keys.sort.select { |n| scheduled_in_this_env?(n) }.each do |name| %>
     <% config = Resque.schedule[name] %>
     <tr>
       <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">

data/lib/resque_scheduler/version.rb

@@ -1,5 +1,5 @@
 # vim:fileencoding=utf-8
 
 module ResqueScheduler
-  VERSION = '2.5.4'
+  VERSION = '2.5.5'
 end

data/resque-scheduler.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop' unless RUBY_VERSION < '1.9'
   spec.add_development_dependency 'simplecov' unless RUBY_VERSION < '1.9'
 
+  spec.add_runtime_dependency 'mono_logger', '~> 1.0'
   spec.add_runtime_dependency 'redis', '~> 3.0.4'
   spec.add_runtime_dependency 'resque', '~> 1.25.1'
   spec.add_runtime_dependency 'rufus-scheduler', '~> 2.0.24'

data/test/resque-web_test.rb

@@ -11,7 +11,7 @@ end
 
 context "on GET to /schedule with scheduled jobs" do
   setup do
-    ENV['rails_env'] = 'production'
+    Resque::Scheduler.env = 'production'
     Resque.schedule = {
       'some_ivar_job' => {
         'cron' => "* * * * *",
@@ -26,6 +26,13 @@ context "on GET to /schedule with scheduled jobs" do
         'args' => {
           'b' => 'blah'
         }
+      },
+      'some_fancy_job' => {
+        'every' => ['1m'],
+        'queue' => 'fancy',
+        'class' => 'SomeFancyJob',
+        'args' => 'sparkles',
+        'rails_env' => 'fancy'
       }
     }
     Resque::Scheduler.load_schedule!
@@ -37,6 +44,10 @@ context "on GET to /schedule with scheduled jobs" do
   test 'see the scheduled job' do
     assert last_response.body.include?('SomeIvarJob')
   end
+
+  test 'excludes jobs for other envs' do
+    assert !last_response.body.include?('SomeFancyJob')
+  end
 end
 
 context "on GET to /delayed" do

data/test/scheduler_locking_test.rb

@@ -238,5 +238,54 @@ context 'Resque::Scheduler::Lock::Resilient' do
 
       assert Resque.redis.ttl(@lock.key) <= 10, "TTL should not have been updated"
     end
+
+    test 'setting the lock timeout changes the key TTL if we hold it' do
+      @lock.acquire!
+
+      @lock.stubs(:locked?).returns(true)
+      @lock.timeout = 120
+      ttl = Resque.redis.ttl(@lock.key)
+      assert_send [ttl, :>, 100]
+
+      @lock.stubs(:locked?).returns(true)
+      @lock.timeout = 180
+      ttl = Resque.redis.ttl(@lock.key)
+      assert_send [ttl, :>, 120]
+    end
+
+    test 'setting lock timeout is a noop if not held' do
+      @lock.acquire!
+      @lock.timeout = 100
+      @lock.stubs(:locked?).returns(false)
+      @lock.timeout = 120
+      assert_equal 100, @lock.timeout
+    end
+
+    test 'setting lock timeout nils out lock script' do
+      @lock.acquire!
+      @lock.timeout = 100
+      assert_equal nil, @lock.instance_variable_get(:@locked_sha)
+    end
+
+    test 'setting lock timeout does not nil out lock script if not held' do
+      @lock.acquire!
+      @lock.locked?
+      @lock.stubs(:locked?).returns(false)
+      @lock.timeout = 100
+      assert_not_nil @lock.instance_variable_get(:@locked_sha)
+    end
+
+    test 'setting lock timeout nils out acquire script' do
+      @lock.acquire!
+      @lock.timeout = 100
+      assert_equal nil, @lock.instance_variable_get(:@acquire_sha)
+    end
+
+    test 'setting lock timeout does not nil out acquire script if not held' do
+      @lock.acquire!
+      @lock.stubs(:locked?).returns(false)
+      @lock.timeout = 100
+      assert_not_nil @lock.instance_variable_get(:@acquire_sha)
+    end
   end
 end

data/test/scheduler_setup_test.rb

@@ -12,7 +12,7 @@ context "Resque::Scheduler" do
   teardown { restore_devnull_logfile }
 
   test 'set custom logger' do
-    custom_logger = Logger.new('/dev/null')
+    custom_logger = MonoLogger.new('/dev/null')
     Resque::Scheduler.logger = custom_logger
     assert_equal(custom_logger, Resque::Scheduler.logger)
   end
@@ -62,11 +62,11 @@ context "Resque::Scheduler" do
     end
 
     test 'not verbose' do
-      assert Resque::Scheduler.logger.level > Logger::DEBUG
+      assert Resque::Scheduler.logger.level > MonoLogger::DEBUG
     end
 
     test 'not muted' do
-      assert Resque::Scheduler.logger.level < Logger::FATAL
+      assert Resque::Scheduler.logger.level < MonoLogger::FATAL
     end
   end
 
@@ -84,12 +84,12 @@ context "Resque::Scheduler" do
 
     test 'set verbosity' do
       Resque::Scheduler.verbose = true
-      assert Resque::Scheduler.logger.level == Logger::DEBUG
+      assert Resque::Scheduler.logger.level == MonoLogger::DEBUG
     end
 
     test 'mute logger' do
       Resque::Scheduler.mute = true
-      assert Resque::Scheduler.logger.level == Logger::FATAL
+      assert Resque::Scheduler.logger.level == MonoLogger::FATAL
     end
   end
 end

data/test/test_helper.rb

@@ -81,6 +81,12 @@ class SomeIvarJob < SomeJob
   @queue = :ivar
 end
 
+class SomeFancyJob < SomeJob
+  def self.queue
+    :fancy
+  end
+end
+
 class SomeQuickJob < SomeJob
   @queue = :quick
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling on top of Resque