Catch common mailhost errors when activity fails (eg, with a unconfigured...

Catch common mailhost errors when activity fails (eg, with a unconfigured mailhost) to avoid adding mailhost-related backtrace to activity failure backtraces in logs.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16028 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/CMFActivity/ActivityTool.py

@@ -51,6 +51,7 @@ from ActivityBuffer import ActivityBuffer
 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 @@ Exception: %s %s
 """ % (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.