Merge 25e67ef into fa4febd

unchartedcode · Nov 23, 2015 · 3f9b4ca · 3f9b4ca
2 parents fa4febd + 25e67ef
commit 3f9b4ca
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb
@@ -211,6 +211,14 @@ def schedule_next_job(hostname=nil)
           redis.zrem Manager.queue_key(hostname), key
           return
         end
+
+        unless klass.respond_to?(:daily) &&
+               klass.respond_to?(:every)
+          # job klass exists but no longer extends from the base
+          redis.zrem Manager.queue_key(hostname), key
+          return
+        end
+
         info = schedule_info(klass)
         info.prev_run = Time.now.to_i
         info.prev_result = "QUEUED"

diff --git a/spec/manager_spec.rb b/spec/manager_spec.rb
@@ -51,6 +51,9 @@ def perform
         self.class.runs += 1
       end
     end
+
+    class InvalidJob
+    end
   end
 
   let(:manager) { Scheduler::Manager.new($redis) }
@@ -114,6 +117,12 @@ def perform
       expect($redis.zcard(Scheduler::Manager.queue_key)).to eq(0)
     end
 
+    it 'should nuke invalid jobs' do
+      $redis.zadd Scheduler::Manager.queue_key, Time.now.to_i - 1000, "Testing::InvalidJob"
+      manager.tick
+      expect($redis.zcard(Scheduler::Manager.queue_key)).to eq(0)
+    end
+
     it 'should recover from crashed manager' do
 
       info = manager.schedule_info(Testing::SuperLongJob)