diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-24 16:23:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-24 16:23:55 +0100 |
| commit | 61f36d9939e7fb3b7c977d2ce334b3610535d86c (patch) | |
| tree | dcc9be8eb8b9fa719843baa844340e629b1b8cb7 /synapse/push | |
| parent | Don't insert events into 'event_*_extremeties' tables if they're outliers (diff) | |
| parent | Don't make pushers handle presence/typing events (diff) | |
| download | synapse-61f36d9939e7fb3b7c977d2ce334b3610535d86c.tar.xz | |
Merge pull request #242 from matrix-org/erikj/pushers_ephemeral_events
Don't make pushers handle presence/typing events
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/__init__.py | 8 |
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 |