CVS: tmda/bin tmda-rfilter,1.9,1.10

Update of /cvsroot/tmda/tmda/bin
In directory usw-pr-cvs1:/tmp/cvs-serv24706/bin

Modified Files:
        tmda-rfilter 
Log Message:
Write "CONFIRM pending" log entry only after the bounce is sent,
otherwise you'll end up with duplicate entries in LOGFILE_INCOMING if
the message is deferred due to problems with send_bounce() or
send_cc().


Index: tmda-rfilter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-rfilter,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tmda-rfilter        2002/01/11 21:23:16     1.9
+++ tmda-rfilter        2002/01/15 19:59:29     1.10
@@ -514,7 +514,6 @@
         message_headers['Return-Path'] = '<' + envelope_sender + '>'
         pending_contents = str(message_headers) + '\n' + message_body
         Util.writefile(pending_contents, pendingdir + '/' + pending_message)
-        logit("CONFIRM pending " + pending_message)
     # Find the right template.
     if env_template and os.path.exists(env_template):
         right_template = env_template
@@ -532,6 +531,7 @@
             send_cc(Defaults.CONFIRM_CC)
         send_bounce(bounce_message,
                     confirm_accept_address = confirm_accept_address)
+        logit("CONFIRM pending " + pending_message)
         mta.stop()  
 
 

_______________________________________________
tmda-cvs mailing list
http://libertine.org/lists/listinfo/tmda-cvs