summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-10-11 15:41:55 +0100
committerGitHub <noreply@github.com>2016-10-11 15:41:55 +0100
commite641115421b44c567bc0f1ca8d39a83e32891383 (patch)
tree51a8cb5ed3f294887bdcc2d6ef36efcad186af07 /synapse/app/pusher.py
parentMerge pull request #1166 from matrix-org/rav/grandfather_broken_riot_signup (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/replicatio... (diff)
downloadsynapse-e641115421b44c567bc0f1ca8d39a83e32891383.tar.xz
Merge pull request #1141 from matrix-org/erikj/replication_noop
Reduce DB hits for replication
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index d59f4a571c..1a6f5507a9 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -197,7 +197,7 @@ class PusherServer(HomeServer):
                     yield start_pusher(user_id, app_id, pushkey)
 
             stream = results.get("events")
-            if stream:
+            if stream and stream["rows"]:
                 min_stream_id = stream["rows"][0][0]
                 max_stream_id = stream["position"]
                 preserve_fn(pusher_pool.on_new_notifications)(
@@ -205,7 +205,7 @@ class PusherServer(HomeServer):
                 )
 
             stream = results.get("receipts")
-            if stream:
+            if stream and stream["rows"]:
                 rows = stream["rows"]
                 affected_room_ids = set(row[1] for row in rows)
                 min_stream_id = rows[0][0]