-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: automatically remove queued messages with stale locks (#2872)
- Loading branch information
Showing
14 changed files
with
323 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# frozen_string_literal: true | ||
|
||
class TidyQueuedMessagesTask < ApplicationScheduledTask | ||
|
||
def call | ||
QueuedMessage.with_stale_lock.in_batches do |messages| | ||
messages.each do |message| | ||
logger.info "removing queued message #{message.id} (locked at #{message.locked_at} by #{message.locked_by})" | ||
message.destroy | ||
end | ||
end | ||
end | ||
|
||
def self.next_run_after | ||
quarter_to_each_hour | ||
end | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,50 @@ | ||
%ul.messageList | ||
- for message in messages | ||
|
||
- if message.is_a?(QueuedMessage) | ||
- queued_message = message | ||
- message = message.message | ||
%li.messageList__message | ||
= link_to organization_server_message_path(organization, @server, message.id), :class => 'messageList__link' do | ||
.messageList__details{:class => 'messageList__details--' + message.scope} | ||
%p.messageList__subject= message.subject || "No subject" | ||
%dl.messageList__addresses | ||
%dt To | ||
%dd | ||
- if message.rcpt_to_return_path? | ||
%span.returnPathTag Return Path | ||
- else | ||
= message.rcpt_to || "none" | ||
%dt From | ||
%dd= message.mail_from || "none" | ||
|
||
|
||
- if message.nil? && queued_message | ||
%li.messageList__message | ||
.messageList__link | ||
.messageList__details | ||
%p.messageList__subject Deleted message ##{queued_message.message_id} | ||
%dl.messageList__addresses | ||
%dt Domain | ||
%dd= queued_message.domain | ||
%dt Locked | ||
%dd= queued_message.locked? ? "Yes" : "No" | ||
.messageList__meta | ||
%p.messageList__timestamp= queued_message.created_at.in_time_zone.to_fs(:long) | ||
%p.messageList__status | ||
%span.label{:class => "label--messageStatus-deleted"} Deleted | ||
|
||
.messageList__meta | ||
%p.messageList__timestamp= message.timestamp.in_time_zone.to_fs(:long) | ||
%p.messageList__status | ||
- if message.read? | ||
%span.label.label--purple Opened | ||
%span.label{:class => "label--messageStatus-#{message.status.underscore}"}= message.status.underscore.humanize | ||
|
||
- else | ||
%li.messageList__message | ||
= link_to organization_server_message_path(organization, @server, message.id), :class => 'messageList__link' do | ||
.messageList__details{:class => 'messageList__details--' + message.scope} | ||
%p.messageList__subject= message.subject || "No subject" | ||
%dl.messageList__addresses | ||
%dt To | ||
%dd | ||
- if message.rcpt_to_return_path? | ||
%span.returnPathTag Return Path | ||
- else | ||
= message.rcpt_to || "none" | ||
%dt From | ||
%dd= message.mail_from || "none" | ||
- if queued_message | ||
%dt Attempts | ||
%dd= queued_message.attempts | ||
%dt Retry after | ||
%dd= queued_message.retry_after&.to_fs(:short) || "ASAP" | ||
|
||
.messageList__meta | ||
%p.messageList__timestamp= message.timestamp.in_time_zone.to_fs(:long) | ||
%p.messageList__status | ||
- if message.read? | ||
%span.label.label--purple Opened | ||
%span.label{:class => "label--messageStatus-#{message.status.underscore}"}= message.status.underscore.humanize |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.