Changeset 14310:2443ec5b2279 in mirror

Timestamp:

Sep 25, 2023, 2:14:31 AM (4 days ago)

Author:

Ryan J Ollos

Branch:

trunk

Phase:

draft

Convert:

[17726]

Message:

1.7.1dev: Merge r17725 from 1.6-stable

Refs #13515

Location:

trac

Files:

• notification/api.py (modified) (3 diffs)
• ticket/web_ui.py (modified) (2 diffs)

trac/notification/api.py

@@ -23 +23 @@
 from trac.core import Component, Interface, ExtensionPoint
 from trac.util import as_bool, lazy, to_list
+from trac.util.text import exception_to_unicode
 
 
@@ -209 +210 @@
         self.author = author
 
+    def __repr__(self):
+        return '<%s realm=%r, category=%r, target=%r, time=%r, author=%r>' % \
+               (self.__class__.__name__, self.realm, self.category,
+                self.target, self.time, self.author)
+
 
 class NotificationSystem(Component):
@@ -354 +360 @@
         :param event: a `NotificationEvent`
         """
-        self.distribute_event(event, self.subscriptions(event))
+        try:
+            self.distribute_event(event, self.subscriptions(event))
+        except Exception as e:
+            self.log.error("Failure distributing event %r%s", event,
+                           exception_to_unicode(e, traceback=True))
+            raise
 
     def distribute_event(self, event, subscriptions):

trac/ticket/web_ui.py

@@ -1348 +1348 @@
             self.log.error("Failure sending notification on creation of "
                            "ticket #%s: %s",
-                           ticket.id, exception_to_unicode(e, traceback=True))
+                           ticket.id, exception_to_unicode(e))
             add_warning(req, tag_("The ticket has been created, but an error "
                                   "occurred while sending notifications: "
@@ -1388 +1388 @@
             except Exception as e:
                 self.log.error("Failure sending notification on change to "
-                               "ticket #%s: %s", ticket.id,
-                               exception_to_unicode(e, traceback=True))
+                               "ticket #%s: %s",
+                               ticket.id, exception_to_unicode(e))
                 # TRANSLATOR: The 'change' has been saved... (link)
                 change = _('change')