resque-scheduler 2.0.0.a → 2.0.0.b

data/HISTORY.md

@@ -3,6 +3,11 @@
 * Dynamic schedule support (brianjlandau, davidyang)
 * Now depends on redis >=1.3
 
+## 1.9.8 (???)
+
+* Validates delayed jobs prior to insertion into the delayed queue (bogdan)
+* Rescue exceptions that occur during queuing and log them (dgrijalva)
+
 ## 1.9.7 (2010-11-09)
 
 * Support for rufus-scheduler "every" syntax (fallwith)

data/lib/resque/scheduler.rb

@@ -62,6 +62,9 @@ module Resque
       # Pulls the schedule from Resque.schedule and loads it into the
       # rufus scheduler instance
       def load_schedule!
+        # Need to load the schedule from redis for the first time if dynamic
+        Resque.reload_schedule! if dynamic 
+        
         log! "Schedule empty! Set Resque.schedule" if Resque.schedule.empty?
         
         @@scheduled_jobs = {}
@@ -129,14 +132,7 @@ module Resque
           handle_shutdown do
             if item = Resque.next_item_for_timestamp(timestamp)
               log "queuing #{item['class']} [delayed]"
-              queue = item['queue'] || Resque.queue_from_class(constantize(item['class']))
-              # Support custom job classes like job with status
-              if (job_klass = item['custom_job_class']) && (job_klass != 'Resque::Job')
-                # custom job classes not supporting the same API calls must implement the #schedule method
-                constantize(job_klass).scheduled(queue, item['class'], *item['args'])
-              else
-                Resque::Job.create(queue, item['class'], *item['args'])
-              end
+              enqueue_from_config(item)
             end
           end
         # continue processing until there are no more ready items in this timestamp
@@ -150,18 +146,27 @@ module Resque
       end
 
       # Enqueues a job based on a config hash
-      def enqueue_from_config(config)
-        args = config['args'] || config[:args]
-        klass_name = config['class'] || config[:class]
+      def enqueue_from_config(job_config)
+        args = job_config['args'] || job_config[:args]
+        klass_name = job_config['class'] || job_config[:class]
         params = args.is_a?(Hash) ? [args] : Array(args)
-        queue = config['queue'] || config[:queue] || Resque.queue_from_class(constantize(klass_name))
-        # Support custom job classes like job with status
-        if (job_klass = config['custom_job_class']) && (job_klass != 'Resque::Job')
-          # custom job classes not supporting the same API calls must implement the #schedule method
-          constantize(job_klass).scheduled(queue, klass_name, *params)
+        queue = job_config['queue'] || job_config[:queue] || Resque.queue_from_class(constantize(klass_name))
+        # Support custom job classes like those that inherit from Resque::JobWithStatus (resque-status)
+        if (job_klass = job_config['custom_job_class']) && (job_klass != 'Resque::Job')
+          # The custom job class API must offer a static "scheduled" method. If the custom
+          # job class can not be constantized (via a requeue call from the web perhaps), fall
+          # back to enqueing normally via Resque::Job.create.
+          begin
+            constantize(job_klass).scheduled(queue, klass_name, *params)
+          rescue NameError
+            # Note that the custom job class (job_config['custom_job_class']) is the one enqueued
+            Resque::Job.create(queue, job_klass, *params)
+          end
         else
           Resque::Job.create(queue, klass_name, *params)
         end        
+      rescue
+        log! "Failed to enqueue #{klass_name}:\n #{$!}"
       end
 
       def rufus_scheduler
@@ -180,7 +185,6 @@ module Resque
       def reload_schedule!
         procline "Reloading Schedule"
         clear_schedule!
-        Resque.reload_schedule!
         load_schedule!
       end
       
@@ -232,8 +236,8 @@ module Resque
       end
       
       def procline(string)
+        log! string
         $0 = "resque-scheduler-#{ResqueScheduler::Version}: #{string}"
-        log! $0
       end
 
     end

data/lib/resque_scheduler.rb

@@ -85,6 +85,7 @@ module ResqueScheduler
   # for queueing.  Until timestamp is in the past, the job will
   # sit in the schedule list.
   def enqueue_at(timestamp, klass, *args)
+    validate_job!(klass)
     delayed_push(timestamp, job_to_hash(klass, args))
   end
 
@@ -194,6 +195,16 @@ module ResqueScheduler
       end
     end
 
+    def validate_job!(klass)
+      if klass.to_s.empty?
+        raise Resque::NoClassError.new("Jobs must be given a class.")
+      end
+
+      unless queue_from_class(klass)
+        raise Resque::NoQueueError.new("Jobs must be placed onto a queue.")
+      end
+    end
+
 end
 
 Resque.extend ResqueScheduler

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

@@ -26,9 +26,13 @@
       </td>
       <td><%= h name %></td>
       <td><%= h config['description'] %></td>
-      <td style="white-space:nowrap"><%= (config['cron'].nil? && !config['every'].nil?) ?
-                                         h('every: ' + config['every']) : 
-                                         h('cron: ' + config['cron']) %></td>
+      <td style="white-space:nowrap"><%= if !config['every'].nil? 
+                                           h('every: ' + config['every'])
+                                         elsif !config['cron'].nil?
+                                           h('cron: ' + config['cron']) 
+                                         else
+                                           'Not currently scheduled'
+                                         end %></td>
       <td><%= (config['class'].nil? && !config['custom_job_class'].nil?) ?
               h(config['custom_job_class']) :
               h(config['class']) %></td>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '2.0.0.a'
+  Version = '2.0.0.b'
 end

data/test/delayed_queue_test.rb

@@ -217,4 +217,13 @@ class Resque::DelayedQueueTest < Test::Unit::TestCase
     assert_equal(2, Resque.remove_delayed(SomeIvarJob, "bar"))
     assert_equal(2, Resque.count_all_scheduled_jobs)
   end
+
+  def test_invalid_job_class
+    assert_raise Resque::NoClassError do
+      Resque.enqueue_in(10, nil)
+    end
+    assert_raise Resque::NoQueueError do
+      Resque.enqueue_in(10, String) # string serves as invalid Job class
+    end
+  end
 end

data/test/scheduler_test.rb

@@ -25,6 +25,11 @@ class Resque::SchedulerTest < Test::Unit::TestCase
     Resque::Scheduler.enqueue_from_config('every' => '1m', 'class' => 'JamesJob', 'args' => '/tmp', 'queue' => 'james_queue')
   end
 
+  def test_enqueue_from_config_doesnt_crash_on_exception_when_enqueueing
+    Resque::Job.stubs(:create).raises(Resque::NoQueueError, 'test exception').with(:ivar, 'SomeIvarJob', '/tmp')
+    Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")
+  end
+
   def test_enqueue_from_config_puts_stuff_in_the_resque_queue
     Resque::Job.stubs(:create).once.returns(true).with(:ivar, 'SomeIvarJob', '/tmp')
     Resque::Scheduler.enqueue_from_config('cron' => "* * * * *", 'class' => 'SomeIvarJob', 'args' => "/tmp")

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 0
   - 0
-  - a
-  version: 2.0.0.a
+  - b
+  version: 2.0.0.b
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -08:00
+date: 2011-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency