bail out early in on_new_receipts if no pushers (#4706)

matrix-org · Feb 21, 2019 · 0abb094 · 0abb094
1 parent 6d65659
commit 0abb094
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/changelog.d/4706.misc b/changelog.d/4706.misc
@@ -0,0 +1 @@
+Avoid some redundant work when processing read receipts
diff --git a/synapse/push/pusherpool.py b/synapse/push/pusherpool.py
@@ -140,6 +140,10 @@ def remove_pushers_by_access_token(self, user_id, access_tokens):
 
     @defer.inlineCallbacks
     def on_new_notifications(self, min_stream_id, max_stream_id):
+        if not self.pushers:
+            # nothing to do here.
+            return
+
         try:
             users_affected = yield self.store.get_push_action_users_in_range(
                 min_stream_id, max_stream_id
@@ -155,6 +159,10 @@ def on_new_notifications(self, min_stream_id, max_stream_id):
 
     @defer.inlineCallbacks
     def on_new_receipts(self, min_stream_id, max_stream_id, affected_room_ids):
+        if not self.pushers:
+            # nothing to do here.
+            return
+
         try:
             # Need to subtract 1 from the minimum because the lower bound here
             # is not inclusive