que-scheduler 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e54bf837ce1acc9f829cdf334cc2cc7cd95d3fd
-  data.tar.gz: 5d0f91e0731cb89afd76d8d59879f896a56821ef
+  metadata.gz: 9640010d4ce493c0f9dc4e14cba6dd02a3b73b78
+  data.tar.gz: e30a1e6efc66e40f1946847008de970be9f23c44
 SHA512:
-  metadata.gz: ee6bbaea0a10b325e0e81c4137fb94ba09eb8697dc59134251bb4794fc5e64381bfab040bc5e9c41c42302cdee763b90c71d96b1df47d612a32a660388812489
-  data.tar.gz: 790f298880c4bbeb5b7b876221a1da6cab6ec061feb350cdb3e879f3148bad08d9450e3996c14ea02d2b97c349401b399419b223c1421d7aea81e223a7137dca
+  metadata.gz: dda04070144829a52281735bde7fce1c7ea7125a0273914524b4fa9d427ef26f17f08a6a097554b4cca9accf01dc72ee36c8b664ac173f754b59fedd597bda2a
+  data.tar.gz: 0e00aeedf7609aca824ce75c20ffcfd2a40786f57832c65164d921fa9a1589681d3f0755c47bfa80a1f190d5f1b6025abe254b7a11de29af2e59f9ad31a1a133

data/lib/que/scheduler/schedule_parser.rb

@@ -2,11 +2,9 @@ require 'fugit'
 
 module Que
   module Scheduler
-    ScheduleParserResult = Struct.new(:missed_jobs, :schedule_dictionary, :seconds_until_next_job)
+    ScheduleParserResult = Struct.new(:missed_jobs, :schedule_dictionary)
 
     class ScheduleParser
-      SCHEDULER_FREQUENCY = 60
-
       class << self
         def parse(jobs_list, as_time, last_time, known_jobs)
           missed_jobs = {}
@@ -25,12 +23,13 @@ module Que
             missed_jobs[desc[:clazz]] = missed unless missed.empty?
           end
 
-          seconds_until_next_job = SCHEDULER_FREQUENCY # TODO: make it 1 sec after next known run
-          ScheduleParserResult.new(missed_jobs, schedule_dictionary, seconds_until_next_job)
+          ScheduleParserResult.new(missed_jobs, schedule_dictionary)
         end
 
         private
 
+        # Given a job description, the last scheduler run time, and this run time, return all
+        # the instances that should be enqueued for that job class.
         def calculate_missed_runs(desc, last_scheduler_run_time, as_time)
           jobs_for_class = []
           missed_times = []
@@ -52,6 +51,8 @@ module Que
           jobs_for_class
         end
 
+        # Given a cron, and a "last time", return the next Time the event will occur, or nil if it
+        # is after "to".
         def next_run_time(cron, from, to)
           fugit_cron = Fugit::Cron.parse(cron)
           next_time = fugit_cron.next_time(from)

data/lib/que/scheduler/scheduler_job.rb

@@ -5,34 +5,49 @@ require_relative 'schedule_parser'
 module Que
   module Scheduler
     class SchedulerJob < Que::Job
+      SCHEDULER_FREQUENCY = 60
+
       # Highest possible priority.
       @priority = 0
 
       def run(last_time = nil, known_jobs = [])
         ::ActiveRecord::Base.transaction do
           last_time = last_time.nil? ? Time.now : Time.zone.parse(last_time)
-          as_time = Time.now
+          as_time = Time.zone.now
 
           Que.log({ message: "que-scheduler last ran at #{last_time}." })
 
-          result =
-            ScheduleParser.parse(SchedulerJob.scheduler_config, as_time, last_time, known_jobs)
-          result.missed_jobs.each do |job_class, args_arrays|
-            args_arrays.each { |args|
-              Que.log({ message: "que-scheduler enqueueing #{job_class} with args: #{args}" })
-              job_class.enqueue(*args)
-            }
-          end
-
-          SchedulerJob.enqueue(
-            as_time,
-            result.schedule_dictionary,
-            run_at: as_time + result.seconds_until_next_job
-          )
+          # Obtain the hash of required jobs. Keys are the job classes, and the values are arrays
+          # each containing more arrays for the arguments of that instance.
+          result = enqueue_required_jobs(last_time, as_time, known_jobs)
+          # And enqueue this job again.
+          enqueue_self_again(as_time, result.schedule_dictionary)
           destroy
         end
       end
 
+      private
+
+      def enqueue_required_jobs(last_time, as_time, known_jobs)
+        result =
+          ScheduleParser.parse(SchedulerJob.scheduler_config, as_time, last_time, known_jobs)
+        result.missed_jobs.each do |job_class, args_arrays|
+          args_arrays.each do |args|
+            Que.log({ message: "que-scheduler enqueueing #{job_class} with args: #{args}" })
+            job_class.enqueue(*args)
+          end
+        end
+        result
+      end
+
+      def enqueue_self_again(as_time, schedule_dictionary)
+        SchedulerJob.enqueue(
+          as_time,
+          schedule_dictionary,
+          run_at: as_time.beginning_of_minute + SCHEDULER_FREQUENCY
+        )
+      end
+
       class << self
         def scheduler_config
           @scheduler_config ||= begin
@@ -42,7 +57,7 @@ module Que
         end
 
         # Convert the config hash into a list of real classes and args, parsing the cron and
-        # unmissable parameters.
+        # "unmissable" parameters.
         def jobs_list(schedule)
           schedule.map do |k, v|
             clazz = Object.const_get(v['class'] || k)

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Harry Lascelles