update

Author: jaredmauch

Mailman/Queue/BounceRunner.py

@@ -50,6 +50,11 @@
 from Mailman.Logging.Syslog import syslog
 from Mailman.i18n import _
 
+# Lazy import to avoid circular dependency
+def get_mail_list():
+    from Mailman.MailList import MailList
+    return MailList
+
 COMMASPACE = ', '
 
 class BounceMixin:
@@ -172,7 +177,7 @@ def _dispose(self, mlist, msg, msgdata):
             # Ensure we have a MailList object
             if isinstance(mlist, str):
                 try:
-                    mlist = MailList.MailList(mlist, lock=0)
+                    mlist = get_mail_list()(mlist, lock=0)
                     should_unlock = True
                 except Errors.MMUnknownListError:
                     syslog('error', 'BounceRunner: Unknown list %s', mlist)

Mailman/Queue/IncomingRunner.py

@@ -131,6 +131,11 @@ class IncomingRunner(Runner):
     _track_messages = True
     _max_processed_messages = 10000
     _max_retry_times = 10000
+    
+    # Retry configuration
+    MIN_RETRY_DELAY = 300  # 5 minutes minimum delay between retries
+    MAX_RETRIES = 5  # Maximum number of retry attempts
+    _retry_times = {}  # Track last retry time for each message
 
     def __init__(self, slice=None, numslices=1):
         mailman_log('debug', 'IncomingRunner: Starting initialization')