Update of /cvsroot/mailman/mailman/Mailman/Queue
In directory usw-pr-cvs1:/tmp/cvs-serv18948
Modified Files:
CommandRunner.py
Log Message:
_dispose(): Wrap the ParseMailCommands() call in a try/except. If the
acquisition of the shared pending.db database lock fails, we want to
requeue the message for another try later.
Index: CommandRunner.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Queue/CommandRunner.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** CommandRunner.py 14 Mar 2002 05:02:30 -0000 2.11
--- CommandRunner.py 15 Mar 2002 17:55:39 -0000 2.12
***************
*** 68,72 ****
msg['Subject'] = 'leave'
msg.set_payload('')
! mlist.ParseMailCommands(msg, msgdata)
elif msgdata.get('toconfirm'):
mo = re.match(mm_cfg.VERP_CONFIRM_REGEXP, msg.get('to', ''))
--- 68,77 ----
msg['Subject'] = 'leave'
msg.set_payload('')
! try:
! mlist.ParseMailCommands(msg, msgdata)
! except LockFile.TimeOutError:
! # We probably could not get the lock on the pending
! # database. That's okay, we'll just try again later.
! return 1
elif msgdata.get('toconfirm'):
mo = re.match(mm_cfg.VERP_CONFIRM_REGEXP, msg.get('to', ''))
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
