summary refs log tree commit diff
path: root/synapse/push/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-24 16:19:43 +0100
committerErik Johnston <erik@matrix.org>2015-08-24 16:19:43 +0100
commitf8f3d72e2b6e5b38bb6ab8e057ede454d77d114f (patch)
treedcc9be8eb8b9fa719843baa844340e629b1b8cb7 /synapse/push/__init__.py
parentDon't insert events into 'event_*_extremeties' tables if they're outliers (diff)
downloadsynapse-f8f3d72e2b6e5b38bb6ab8e057ede454d77d114f.tar.xz
Don't make pushers handle presence/typing events
Diffstat (limited to 'synapse/push/__init__.py')
-rw-r--r--synapse/push/__init__.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index 13002e0db4..f1952b5a0f 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -249,7 +249,9 @@ class Pusher(object):
             # we fail to dispatch the push)
             config = PaginationConfig(from_token=None, limit='1')
             chunk = yield self.evStreamHandler.get_stream(
-                self.user_name, config, timeout=0)
+                self.user_name, config, timeout=0, affect_presence=False,
+                only_room_events=True
+            )
             self.last_token = chunk['end']
             self.store.update_pusher_last_token(
                 self.app_id, self.pushkey, self.user_name, self.last_token
@@ -280,8 +282,8 @@ class Pusher(object):
         config = PaginationConfig(from_token=from_tok, limit='1')
         timeout = (300 + random.randint(-60, 60)) * 1000
         chunk = yield self.evStreamHandler.get_stream(
-            self.user_name, config,
-            timeout=timeout, affect_presence=False
+            self.user_name, config, timeout=timeout, affect_presence=False,
+            only_room_events=True
         )
 
         # limiting to 1 may get 1 event plus 1 presence event, so