brianjlandau-resque-scheduler 1.10.8 → 1.10.9

data/brianjlandau-resque-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{brianjlandau-resque-scheduler}
-  s.version = "1.10.8"
+  s.version = "1.10.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben VandenBos", "Brian Landau"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-10-27}
   s.description = %q{Light weight job scheduling on top of Resque.
   Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
   Also supports queueing jobs on a fixed, cron-like schedule.}

data/lib/resque/scheduler.rb

@@ -25,11 +25,12 @@ module Resque
 
       # Schedule all jobs and continually look for delayed jobs (never returns)
       def run
-
+        $0 = "resque-scheduler: Starting"
         # trap signals
         register_signal_handlers
 
         # Load the schedule into rufus
+        procline "Loading Schedule"
         load_schedule!
 
         # Now start the scheduling part of the loop.
@@ -68,6 +69,7 @@ module Resque
         Resque.schedule.each do |name, config|
           load_schedule_job(name, config)
         end
+        procline "Schedules Loaded"
       end
       
       # Loads a job schedule into the Rufus::Scheduler and stores it in @@scheduled_jobs
@@ -98,12 +100,13 @@ module Resque
       # Handles queueing delayed items
       def handle_delayed_items
         item = nil
-        begin
-          if timestamp = Resque.next_delayed_timestamp
+        if timestamp = Resque.next_delayed_timestamp
+          procline "Processing Delayed Items"
+          while !timestamp.nil?
             enqueue_delayed_items_for_timestamp(timestamp)
+            timestamp = Resque.next_delayed_timestamp
           end
-        # continue processing until there are no more ready timestamps
-        end while !timestamp.nil?
+        end
       end
       
       # Enqueues all delayed jobs for a timestamp
@@ -157,11 +160,12 @@ module Resque
       def clear_schedule!
         rufus_scheduler.stop
         @rufus_scheduler = nil
+        @@scheduled_jobs = {}
         rufus_scheduler
       end
       
       def reload_schedule!
-        log! "Reloading Schedule..."
+        procline "Reloading Schedule"
         clear_schedule!
         Resque.reload_schedule!
         load_schedule!
@@ -170,7 +174,7 @@ module Resque
       def update_schedule
         schedule_from_redis = Resque.get_schedules
         if !schedule_from_redis.nil? && schedule_from_redis != Resque.schedule
-          log "Updating schedule..."
+          procline "Updating schedule"
           # unload schedules that no longer exist
           (Resque.schedule.keys - schedule_from_redis.keys).each do |name|
             unschedule_job(name)
@@ -187,6 +191,7 @@ module Resque
           # load new schedule into Resque.schedule
           Resque.schedule = schedule_from_redis
         end
+        procline "Schedules Loaded"
       end
       
       def unschedule_job(name)
@@ -219,6 +224,11 @@ module Resque
         # add "verbose" logic later
         log!(msg) if verbose
       end
+      
+      def procline(string)
+        $0 = "resque-scheduler-#{ResqueScheduler::Version}: #{string}"
+        log! $0
+      end
 
     end
 

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.10.8'
+  Version = '1.10.9'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brianjlandau-resque-scheduler
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 1
   - 10
-  - 8
-  version: 1.10.8
+  - 9
+  version: 1.10.9
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency