diff options
Diffstat (limited to 'Mailman/Defaults.py.in')
| -rw-r--r-- | Mailman/Defaults.py.in | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index 4286e468..06b510e0 100644 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -507,13 +507,13 @@ SMTP_LOG_EVERY_MESSAGE = ( # Mutually exclusive with SMTP_LOG_REFUSED. SMTP_LOG_SUCCESS = ( 'post', - 'post to %(listname)s from %(sender)s, size=%(size)d, success') + 'post to %(listname)s from %(sender)s, size=%(size)d, message-id=%(msg_message-id)s, success') # This will only be printed if there were any addresses which encountered an # immediate smtp failure. Mutually exclusive with SMTP_LOG_SUCCESS. SMTP_LOG_REFUSED = ( 'post', - 'post to %(listname)s from %(sender)s, size=%(size)d, %(#refused)d failures') + 'post to %(listname)s from %(sender)s, size=%(size)d, message-id=%(msg_message-id)s, %(#refused)d failures') # This will be logged for each specific recipient failure. Additional %()s # keys are: @@ -1032,6 +1032,9 @@ PENDING_REQUEST_LIFE = days(3) # will be dequeued and those recipients will never receive the message. DELIVERY_RETRY_PERIOD = days(5) +# How long should we wait before we retry a temporary delivery failure? +DELIVERY_RETRY_WAIT = hours(1) + ##### @@ -1062,6 +1065,25 @@ LIST_LOCK_LIFETIME = hours(5) # the message will be re-queued for later delivery. LIST_LOCK_TIMEOUT = seconds(10) +# Set this to true to turn on lock debugging messages for the pending requests +# database, which will be written to logs/locks. If you think you're having +# lock problems, or just want to tune the locks for your system, turn on lock +# debugging. +PENDINGDB_LOCK_DEBUGGING = 0 + +# This variable specifies how long an attempt will be made to acquire a +# pendingdb lock by the incoming qrunner process. If the lock acquisition +# times out, the message will be re-queued for later delivery. +PENDINGDB_LOCK_TIMEOUT = seconds(30) + +# The pendingdb is shared among all lists, and handles all list +# (un)subscriptions, admin approvals and otherwise held messages, so it is +# potentially locked a lot more often than single lists. Mailman deals with +# this by re-trying any attempts to alter the pendingdb that failed because of +# locking errors. This variable indicates how many attempt should be made +# before abandoning all hope. +PENDINGDB_LOCK_ATTEMPTS = 10 + ##### |