que-scheduler 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15498dda40836c4e4f447f78a2cb5f259df54a2ba6be22d24c4343a3fffad2d1
-  data.tar.gz: b23b41708e1dd364fdd7a101ecdb7a5b6899ea9fad78fe6ca2ff3470db0f08dc
+  metadata.gz: 38a2b7875c377e5464a1c7765a97fbeb7f1619d6ec9d2425278d95faa33b60ee
+  data.tar.gz: 2770026bd29d9e08dd7bf45fa82814e2cec5a7bbf18e656e6003854e5f839822
 SHA512:
-  metadata.gz: 28d70ce26b05e89c0b72ac8ca20b5e730891e032a5bf9a5f3d9e187e145f5f9d5e5ae357bdee1ad752ee11086ef1c9c7188c511adda85bd4ba9abb34d9cc54be
-  data.tar.gz: 7a53a1bd6d4c56c105172ccb2e9a2aa70ab862691bda8473b9476444c3afd4a382f1b0177daa325583cda54719c48ff99f2409bff6f34a29cb64d9cb7029d763
+  metadata.gz: 4a14e16dfe2cb57b90249d3b16747ce92a7a6716bdd79627648df3d8059e1dd0ee86181ee558386ff68a987a4929e90fe19148a26752ee65f58d63be141e962a
+  data.tar.gz: 0674f778f0e1bd9c38927426a9699cb20ff4e8a7b08a8b96807be66cb252295460779f660357b83e9a0893a8147c2e11627ff81e675b0840c602b6642df098ea

data/lib/que/scheduler/audit.rb

@@ -24,11 +24,11 @@ module Que
         def append(scheduler_job_id, executed_at, enqueued_jobs)
           ::Que.execute(INSERT_AUDIT, [scheduler_job_id, executed_at])
           enqueued_jobs.each do |j|
-            attrs = j.attrs
+            attrs = Que::Scheduler::VersionSupport.job_attributes(j)
             inserted = ::Que.execute(
               INSERT_AUDIT_ENQUEUED,
               [scheduler_job_id] +
-                attrs.values_at('job_class', 'queue', 'priority', 'args', 'job_id', 'run_at')
+                attrs.values_at(:job_class, :queue, :priority, :args, :job_id, :run_at)
             )
             raise "Cannot save audit row #{scheduler_job_id} #{executed_at} #{j}" if inserted.empty?
           end

data/lib/que/scheduler/scheduler_job.rb

@@ -4,6 +4,7 @@ require_relative 'schedule'
 require_relative 'enqueueing_calculator'
 require_relative 'scheduler_job_args'
 require_relative 'state_checks'
+require_relative 'version_support'
 
 # The main job that runs every minute, determining what needs to be enqueued, enqueues the required
 # jobs, then re-enqueues itself.
@@ -13,7 +14,7 @@ module Que
       SCHEDULER_FREQUENCY = 60
 
       # Always highest possible priority.
-      @priority = 0
+      Que::Scheduler::VersionSupport.set_priority(self, 0)
 
       def run(options = nil)
         Que::Scheduler::Db.transaction do
@@ -53,7 +54,7 @@ module Que
 
       def check_enqueued_job(enqueued_job, job_class, args, logs)
         if enqueued_job.is_a?(Que::Job)
-          job_id = enqueued_job.attrs.fetch('job_id')
+          job_id = Que::Scheduler::VersionSupport.job_attributes(enqueued_job).fetch(:job_id)
           logs << "que-scheduler enqueueing #{job_class} #{job_id} with args: #{args}"
           enqueued_job
         else
@@ -64,13 +65,23 @@ module Que
       end
 
       def enqueue_self_again(scheduler_job_args, last_full_execution, job_dictionary, enqueued_jobs)
+        # Log last run...
+        job_id = Que::Scheduler::VersionSupport.job_attributes(self).fetch(:job_id)
+        Audit.append(job_id, scheduler_job_args.as_time, enqueued_jobs)
+
+        # And rerun...
         next_run_at = scheduler_job_args.as_time.beginning_of_minute + SCHEDULER_FREQUENCY
-        SchedulerJob.enqueue(
+        enqueued_job = SchedulerJob.enqueue(
           last_run_time: last_full_execution.iso8601,
           job_dictionary: job_dictionary,
           run_at: next_run_at
         )
-        Audit.append(attrs[:job_id], scheduler_job_args.as_time, enqueued_jobs)
+
+        # rubocop:disable Style/GuardClause This reads better as a conditional
+        unless check_enqueued_job(enqueued_job, SchedulerJob, {}, [])
+          raise 'SchedulerJob could not self-schedule. Has `.enqueue` been monkey patched?'
+        end
+        # rubocop:enable Style/GuardClause
       end
     end
   end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '3.2.3'.freeze
+    VERSION = '3.2.4'.freeze
   end
 end

data/lib/que/scheduler/version_support.rb

@@ -0,0 +1,19 @@
+require 'que'
+
+# The purpose of this module is to centralise the differences when supporting both que 0.x and
+# 1.x with the same gem.
+module Que
+  module Scheduler
+    module VersionSupport
+      class << self
+        def set_priority(context, priority)
+          context.instance_variable_set('@priority', priority)
+        end
+
+        def job_attributes(enqueued_job)
+          enqueued_job.attrs.transform_keys(&:to_sym)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -339,6 +339,7 @@ files:
 - lib/que/scheduler/scheduler_job_args.rb
 - lib/que/scheduler/state_checks.rb
 - lib/que/scheduler/version.rb
+- lib/que/scheduler/version_support.rb
 homepage: https://github.com/hlascelles/que-scheduler
 licenses:
 - MIT
@@ -364,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: A cron scheduler for Que