que-scheduler 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad8aa04c2481731bc0acf499f960623906dd4a659b9ae978503b76f218dbe96
-  data.tar.gz: 3c4b81ca9205cd455d7c06c7e94cc1f64d31357fd190e39b2b992e762931216a
+  metadata.gz: f10811f1ba2ecc81c7d0fea63a94dd31f85e383d819de9bae939b24751817ee8
+  data.tar.gz: 7d461f16288e3161845f1c5ea55dbd422ec23fda41ce86394dc0532d2f563ba8
 SHA512:
-  metadata.gz: c61e0fbfa37b704fd6d0c9728645411e071809193bd1de196f4b14500171daba6f95b6fe3846816f2e06cdcc2ecf4f9fa4c88fffdc5a01ed05c4f5d6709b8e92
-  data.tar.gz: df639d756a59c392db7101b58a697939ec4a4e857e41d45fa24491443b82361bcf90625b2f99c059d78f1975113a78e993bdebcf8909039b850f169980713a5a
+  metadata.gz: ec49442550c653717fd8a943a8d46b4ada8431c78098841e9e773b214c89097d0e174936396c05c79cc91d42ebb9c5d5bf8b6bf677d05ae07ba049c011d405f3
+  data.tar.gz: b32792dd60a8895b84cba9b26a6cc01602eae2eacac097e7c4593db2aa2897a4e21eae9a4d626aef1f1ead58f9f13d01cacd588e962446f5ddbfecf6faf40fa5

data/README.md

@@ -27,7 +27,7 @@ files, but with additional features.
     ```ruby
     class CreateQueSchedulerSchema < ActiveRecord::Migration
       def change
-        Que::Scheduler::Migrations.migrate!(version: 3)
+        Que::Scheduler::Migrations.migrate!(version: 4)
       end
     end
     ```

data/lib/que/scheduler/audit.rb

@@ -7,30 +7,30 @@ module Que
       ENQUEUED_TABLE_NAME = 'que_scheduler_audit_enqueued'
       INSERT_AUDIT = %{
         INSERT INTO #{TABLE_NAME} (scheduler_job_id, executed_at)
-        VALUES ($1::integer, $2::timestamptz)
+        VALUES ($1::bigint, $2::timestamptz)
         RETURNING *
       }
       INSERT_AUDIT_ENQUEUED = %{
-        INSERT INTO #{ENQUEUED_TABLE_NAME} (scheduler_job_id, job_class, queue, priority, args)
-        VALUES ($1::integer, $2::varchar, $3::varchar, $4::integer, $5::jsonb)
+        INSERT INTO #{ENQUEUED_TABLE_NAME}
+        (scheduler_job_id, job_class, queue, priority, args, job_id, run_at)
+        VALUES (
+          $1::bigint, $2::varchar, $3::varchar,
+          $4::integer, $5::jsonb, $6::bigint, $7::timestamptz
+        )
         RETURNING *
       }
 
       class << self
-        def append(job_id, executed_at, result)
-          ::Que.execute(INSERT_AUDIT, [job_id, executed_at])
-          result.missed_jobs.each do |j|
+        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
             inserted = ::Que.execute(
               INSERT_AUDIT_ENQUEUED,
-              [
-                job_id,
-                j.job_class,
-                j.queue,
-                j.priority,
-                j.args
-              ]
+              [scheduler_job_id] +
+                attrs.values_at('job_class', 'queue', 'priority', 'args', 'job_id', 'run_at')
             )
-            raise "Cannot save audit row #{job_id} #{executed_at} #{j}" if inserted.empty?
+            raise "Cannot save audit row #{scheduler_job_id} #{executed_at} #{j}" if inserted.empty?
           end
         end
       end

data/lib/que/scheduler/migrations/4/down.sql

@@ -0,0 +1,5 @@
+ALTER TABLE que_scheduler_audit ALTER COLUMN scheduler_job_id TYPE integer;
+ALTER TABLE que_scheduler_audit_enqueued ALTER COLUMN scheduler_job_id TYPE integer;
+
+ALTER TABLE que_scheduler_audit_enqueued DROP COLUMN job_id;
+ALTER TABLE que_scheduler_audit_enqueued DROP COLUMN run_at;

data/lib/que/scheduler/migrations/4/up.sql

@@ -0,0 +1,7 @@
+ALTER TABLE que_scheduler_audit ALTER COLUMN scheduler_job_id TYPE bigint;
+ALTER TABLE que_scheduler_audit_enqueued ALTER COLUMN scheduler_job_id TYPE bigint;
+
+ALTER TABLE que_scheduler_audit_enqueued ADD COLUMN job_id bigint;
+ALTER TABLE que_scheduler_audit_enqueued ADD COLUMN run_at timestamptz;
+
+CREATE INDEX que_scheduler_audit_enqueued_job_id ON que_scheduler_audit_enqueued USING btree (job_id);

data/lib/que/scheduler/scheduler_job.rb

@@ -21,8 +21,10 @@ module Que
           logs = ["que-scheduler last ran at #{scheduler_job_args.last_run_time}."]
 
           result = EnqueueingCalculator.parse(DefinedJob.defined_jobs, scheduler_job_args)
-          enqueue_required_jobs(result, logs)
-          enqueue_self_again(scheduler_job_args, scheduler_job_args.as_time, result)
+          enqueued_jobs = enqueue_required_jobs(result, logs)
+          enqueue_self_again(
+            scheduler_job_args, scheduler_job_args.as_time, result.job_dictionary, enqueued_jobs
+          )
 
           # Only now we're sure nothing errored, log the results
           logs.each { |str| ::Que.log(message: str) }
@@ -31,16 +33,19 @@ module Que
       end
 
       def enqueue_required_jobs(result, logs)
-        result.missed_jobs.each do |to_enqueue|
+        result.missed_jobs.map do |to_enqueue|
           job_class = to_enqueue.job_class
           args = to_enqueue.args
           remaining_hash = to_enqueue.except(:job_class, :args)
-          if args.is_a?(Hash)
-            job_class.enqueue(args.merge(remaining_hash))
-          else
-            job_class.enqueue(*args, remaining_hash)
-          end
-          logs << "que-scheduler enqueueing #{job_class} with: #{to_enqueue}"
+          enqueued_job =
+            if args.is_a?(Hash)
+              job_class.enqueue(args.merge(remaining_hash))
+            else
+              job_class.enqueue(*args, remaining_hash)
+            end
+          job_id = enqueued_job.attrs.fetch('job_id')
+          logs << "que-scheduler enqueueing #{job_class} #{job_id} with: #{to_enqueue}"
+          enqueued_job
         end
       end
 
@@ -52,14 +57,14 @@ module Que
         raise "Only one #{self.class.name} should be enqueued. #{schedulers} were found."
       end
 
-      def enqueue_self_again(scheduler_job_args, last_full_execution, result)
+      def enqueue_self_again(scheduler_job_args, last_full_execution, job_dictionary, enqueued_jobs)
         next_run_at = scheduler_job_args.as_time.beginning_of_minute + SCHEDULER_FREQUENCY
         SchedulerJob.enqueue(
           last_run_time: last_full_execution.iso8601,
-          job_dictionary: result.job_dictionary,
+          job_dictionary: job_dictionary,
           run_at: next_run_at
         )
-        Audit.append(attrs[:job_id], scheduler_job_args.as_time, result)
+        Audit.append(attrs[:job_id], scheduler_job_args.as_time, enqueued_jobs)
       end
     end
   end

data/lib/que/scheduler/version.rb

@@ -1,5 +1,5 @@
 module Que
   module Scheduler
-    VERSION = '2.1.2'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Harry Lascelles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -311,6 +311,8 @@ files:
 - lib/que/scheduler/migrations/2/up.sql
 - lib/que/scheduler/migrations/3/down.sql
 - lib/que/scheduler/migrations/3/up.sql
+- lib/que/scheduler/migrations/4/down.sql
+- lib/que/scheduler/migrations/4/up.sql
 - lib/que/scheduler/scheduler_job.rb
 - lib/que/scheduler/scheduler_job_args.rb
 - lib/que/scheduler/version.rb