ghaymah_dev/postal
1
1
Fork 0
mirror of https://github.com/postalserver/postal.git synced 2026-10-19 10:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change retry and batching timing calculations (#2371)

Browse Source 
This patch changes the requeue behaviour to requeue messages that are 30 seconds past their retry time.
Batching now includes messages that are any amount past their retry time.
This change avoids batching messages before theur graylisting time, but maintains efficient batching.
This commit is contained in:
Charlie Smurthwaite
2023-03-22 14:02:28 +00:00
committed by GitHub
parent c6fb8d223b
commit c8d27b2963
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/queued_message.rb
+4 -3
View File
@@ -36,10 +36,11 @@ class QueuedMessage < ApplicationRecord
after_commit :queue, on: :create after_commit :queue, on: :create
scope :unlocked, -> { where(locked_at: nil) } scope :unlocked, -> { where(locked_at: nil) }
scope :retriable, -> { where("retry_after IS NULL OR retry_after <= ?", 30.seconds.from_now) } scope :retriable, -> { where("retry_after IS NULL OR retry_after < ?", Time.now) }
scope :requeueable, -> { where("retry_after IS NULL OR retry_after < ?", 30.seconds.ago) }
def retriable? def retriable?
retry_after.nil? || retry_after <= 30.seconds.from_now retry_after.nil? || retry_after < Time.now
end end
def queue def queue
@@ -117,7 +118,7 @@ class QueuedMessage < ApplicationRecord
end end
def self.requeue_all def self.requeue_all
unlocked.retriable.each(&:queue) unlocked.requeueable.each(&:queue)
end end
end end