summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-04-03 15:14:11 +0100
committerRichard van der Hoff <richard@matrix.org>2017-04-03 15:14:11 +0100
commit773e1c6d68223c787bff1da78baef519a70f8c3d (patch)
tree519bfbb2eb6d48ddbab59a2fef432855419419b4 /synapse/notifier.py
parentMerge pull request #2078 from APwhitehat/assertuserfriendly (diff)
downloadsynapse-773e1c6d68223c787bff1da78baef519a70f8c3d.tar.xz
Remove spurious @preserve_fn decorators
Remove `@preserve_fn` decorators on `on_new_room_event`,
`_notify_pending_new_room_events`, `_on_new_room_event`, `on_new_event`, and
`on_new_replication_data` - none of these functions return a deferred, and the
decorator does nothing unless the wrapped function returns a deferred, so the
decorator was a no-op.
Diffstat (limited to '')
-rw-r--r--synapse/notifier.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 7eeba6d28e..3b206bb96b 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -202,7 +202,6 @@ class Notifier(object):
             lambda: len(self.user_to_user_stream),
         )
 
-    @preserve_fn
     def on_new_room_event(self, event, room_stream_id, max_room_stream_id,
                           extra_users=[]):
         """ Used by handlers to inform the notifier something has happened
@@ -224,7 +223,6 @@ class Notifier(object):
 
             self.notify_replication()
 
-    @preserve_fn
     def _notify_pending_new_room_events(self, max_room_stream_id):
         """Notify for the room events that were queued waiting for a previous
         event to be persisted.
@@ -242,7 +240,6 @@ class Notifier(object):
             else:
                 self._on_new_room_event(event, room_stream_id, extra_users)
 
-    @preserve_fn
     def _on_new_room_event(self, event, room_stream_id, extra_users=[]):
         """Notify any user streams that are interested in this room event"""
         # poke any interested application service.
@@ -260,7 +257,6 @@ class Notifier(object):
             rooms=[event.room_id],
         )
 
-    @preserve_fn
     def on_new_event(self, stream_key, new_token, users=[], rooms=[]):
         """ Used to inform listeners that something has happend event wise.
 
@@ -287,7 +283,6 @@ class Notifier(object):
 
                 self.notify_replication()
 
-    @preserve_fn
     def on_new_replication_data(self):
         """Used to inform replication listeners that something has happend
         without waking up any of the normal user event streams"""