提交: aa3b05da5b0e281b5116ad4c73aa76ac3a81fa13 - allura (git)

allura

Commit MetaInfo

• 修訂: aa3b05da5b0e281b5116ad4c73aa76ac3a81fa13 (tree)
• 時間: 2012-03-15 07:00:58
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Dave Brondsema

Log Message

[#3895] tighter error handling and less scary message, for notification templates

Signed-off-by: Dave Brondsema <[e-mail]>

Change Summary

• modified: Allura/allura/model/notification.py

差異

--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -156,11 +156,13 @@ class Notification(MappedClass):
             ''' Add addional text to the notification e-mail based on the artifact type '''
             template = cls.view.get_template('mail/' + artifact.type_s + '.txt')
             d['text'] += template.render(dict(c=c, g=g, config=config, data=artifact))
-        except Exception, e:
+        except jinja2.TemplateNotFound:
+            pass
+        except:
             ''' Catch any errors loading or rendering the template,
             but the notification still gets sent if there is an error
             '''
-            log.debug('Error rendering notification template %s: %s' % (artifact.type_s, e))
+            log.warn('Could not render notification template %s' % artifact.type_s, exc_info=True)
 
         assert d['reply_to_address'] is not None
         project = Project.query.get(_id=d.get('project_id', c.project._id))