pgbus 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25921e6a7a0ac72023501978b6dec0b38645a18b45cece73bf15ddbc655dae8
-  data.tar.gz: 810980a58f382aad948b660a9102cdb6ea3a3af57c3768f1205c3582b0705003
+  metadata.gz: bd4586e94a76eaf20987039101a038af4e64a9d3bcfd5d68b5b2ef984f3459f3
+  data.tar.gz: 98f2e88891c3e7f00963d697d4fc135271a61eccef04aa89dbfb40e0d568b240
 SHA512:
-  metadata.gz: 597fbc986e88b2c37339156de5f21a576d50f45bab5f72343dc3eaed02b730d35dce777285f65b63f3264f4a91d76fa0b7a001635a6c103b08ef95454c6dc71f
-  data.tar.gz: 2a305826eb3b9b0618e64c99e0724c2daf020047933e83d231a35866d8e8b1e334a45c45c03a7fbef577b8dd2243686dc4e351595a671a8d8cd1a63f940602ed
+  metadata.gz: f2df68ef64f8b4ac37dfe509c800688c51e811910855f69807c28a5e3777d0eff10dc989ea4e0180b17ee9feada2549a6faa182052c2bbf88be225ccfa7a45d2
+  data.tar.gz: 4890d5ab0a55df38ba8d74bb704c00a6d82a4abe17784600e19615288b6dfebec50ac07ac7a89a0cdffa95c85299b795071d4a5dbcc9d351bac076a5baca8bc9

data/lib/pgbus/recurring/schedule.rb

@@ -11,7 +11,10 @@ module Pgbus
       end
 
       def due_tasks(time = Time.current)
-        tasks.select { |task| task_due?(task, time) }
+        tasks.filter_map do |task|
+          run_at = canonical_run_at(task, time)
+          [task, run_at] if run_at
+        end
       end
 
       def enqueue_task(task, run_at:)
@@ -34,6 +37,12 @@ module Pgbus
           end
         end
       rescue AlreadyRecorded
+        # AlreadyRecorded means this (task_key, run_at) was already enqueued.
+        # If we acquired a NEW lock (prior lock was already released because the
+        # job completed), release it — no message will use it. If we didn't
+        # acquire a lock (nil or :already_locked), there's nothing to release.
+        # In either case, we are NOT opening a race window because the job for
+        # this run_at already ran or is running.
         release_uniqueness_lock(acquired_key)
         Pgbus.logger.debug { "[Pgbus] Recurring task #{task.key} already enqueued for #{run_at.iso8601}" }
       rescue StandardError
@@ -75,23 +84,31 @@ module Pgbus
         end
       end
 
-      def task_due?(task, time)
-        # A task is due when its most recent cron occurrence (previous_time)
-        # falls within the current tick window. We also check match? to
-        # handle the exact-boundary case where time == cron time.
+      # Returns the canonical run_at time if the task is due, or nil if not.
+      # This ensures a consistent run_at regardless of which tick detects
+      # the cron occurrence — fixing a bug where match?(t) at the exact
+      # boundary returns previous_time=T-1, while a tick 1s later gets
+      # previous_time=T, producing different run_at values for the same
+      # cron occurrence and bypassing RecurringExecution deduplication.
+      def canonical_run_at(task, time)
         cron = task.parsed_schedule
-        return false unless cron
-
-        # Check if `time` itself matches the cron (exact boundary hit)
-        return true if cron.match?(time)
+        return nil unless cron
+
+        # Exact boundary hit: cron.match?(time) is true.
+        # previous_time returns the PRIOR occurrence here, but the cron
+        # time that fired is `time` itself (truncated to the minute).
+        if cron.match?(time)
+          # Fugit next_time from 1 second before gives us the current cron time
+          return cron.next_time(time - 1).to_t
+        end
 
-        # Check if the previous occurrence was recent enough that we should
-        # still fire it (handles the case where we tick slightly after the
-        # cron time). The window is the scheduler interval.
+        # Within the scheduler interval window after the cron time.
         prev = task.previous_time(time)
-        return false unless prev
+        return nil unless prev
 
-        (time - prev) <= @config.recurring_schedule_interval
+        return prev if (time - prev) <= @config.recurring_schedule_interval
+
+        nil
       end
 
       def resolve_queue(task)

data/lib/pgbus/recurring/scheduler.rb

@@ -40,10 +40,7 @@ module Pgbus
       end
 
       def tick(now)
-        schedule.due_tasks(now).each do |task|
-          run_at = task.previous_time(now)
-          next unless run_at
-
+        schedule.due_tasks(now).each do |task, run_at|
           schedule.enqueue_task(task, run_at: run_at)
           @last_runs[task.key] = now
         rescue StandardError => e

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Mikael Henriksson