configurable maximum delivery attempts

closes #59
This commit is contained in:
Adam Cooke
2017-04-29 11:56:25 +01:00
parent 3333a7baf3
commit 45fd472f76
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ class UnqueueMessageJob < Postal::Job
end end
# We might not be able to send this any more, check the attempts # We might not be able to send this any more, check the attempts
if queued_message.attempts >= QueuedMessage::MAX_ATTEMPTS if queued_message.attempts >= Postal.config.general.maximum_delivery_attempts
details = "Maximum number of delivery attempts (#{queued_message.attempts}) has been reached." details = "Maximum number of delivery attempts (#{queued_message.attempts}) has been reached."
if queued_message.message.scope == 'incoming' if queued_message.message.scope == 'incoming'
# Send bounceds to incoming e-mails when they are hard failed # Send bounceds to incoming e-mails when they are hard failed
-2
View File
@@ -26,8 +26,6 @@
class QueuedMessage < ApplicationRecord class QueuedMessage < ApplicationRecord
MAX_ATTEMPTS = 18
include HasMessage include HasMessage
belongs_to :server belongs_to :server
+1 -1
View File
@@ -18,7 +18,7 @@
Mail servers can be enabled to send mail from any domain by the administrator. Mail servers can be enabled to send mail from any domain by the administrator.
%li %li
If a message cannot be delivered, the system will not send you a bounce message but dispatch a webhook (if you set one up). If a message cannot be delivered, the system will not send you a bounce message but dispatch a webhook (if you set one up).
If a message delivery fails but can be retried, the system will try #{QueuedMessage::MAX_ATTEMPTS} times to deliver it before giving up. If a message delivery fails but can be retried, the system will try #{Postal.config.general.maximum_delivery_attempts} times to deliver it before giving up.
.u-margin .u-margin
%h2.pageContent__subTitle Sending using SMTP %h2.pageContent__subTitle Sending using SMTP
%p.pageContent__text %p.pageContent__text
+1
View File
@@ -11,6 +11,7 @@ web:
general: general:
use_ip_pools: false use_ip_pools: false
exception_url: exception_url:
maximum_delivery_attempts: 18
web_server: web_server:
bind_address: 127.0.0.1 bind_address: 127.0.0.1