[Erp5-report] r16028 - /erp5/trunk/products/CMFActivity/ActivityTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Sep  4 11:39:47 2007
New Revision: 16028

URL: http://svn.erp5.org?rev=16028&view=rev
Log:
Catch common mailhost errors when activity fails (eg, with a unconfigured mailhost) to avoid adding mailhost-related backtrace to activity failure backtraces in logs.

Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=16028&r1=16027&r2=16028&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py Tue Sep  4 11:39:47 2007
@@ -51,6 +51,7 @@
 from zExceptions import ExceptionFormatter
 
 from ZODB.POSException import ConflictError
+from Products.MailHost.MailHost import MailHostError
 
 from zLOG import LOG, INFO, WARNING
 
@@ -230,7 +231,10 @@
 """ % (activity_tool.email_from_address, user_email, message,
        message, '/'.join(self.object_path), self.method_id,
        self.exc_type, self.exc_value, self.traceback)
-    activity_tool.MailHost.send( mail_text )
+    try:
+      activity_tool.MailHost.send( mail_text )
+    except (socket.error, MailHostError), message:
+      LOG('ActivityTool.notifyUser', WARNING, 'Mail containing failure information failed to be sent: %s' % (message, ))
 
   def reactivate(self, activity_tool):
     # Reactivate the original object.