summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-03-24 18:07:30 +0000
committerMark Haines <mjark@negativecurvature.net>2016-03-24 18:07:30 +0000
commit3e8bb99a2b6bca8aca329c3cca92114435833f83 (patch)
tree83f7846ffa872486bf98a3012e818f429ec26829 /synapse/rest/client
parentMerge pull request #667 from matrix-org/dbkr/never_notify_member_events (diff)
parentFix typo (diff)
downloadsynapse-3e8bb99a2b6bca8aca329c3cca92114435833f83.tar.xz
Merge pull request #668 from matrix-org/markjh/deduplicate
Deduplicate identical /sync requests
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index de4a020ad4..c5785d7074 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -115,6 +115,8 @@ class SyncRestServlet(RestServlet):
             )
         )
 
+        request_key = (user, timeout, since, filter_id, full_state)
+
         if filter_id:
             if filter_id.startswith('{'):
                 try:
@@ -134,6 +136,7 @@ class SyncRestServlet(RestServlet):
             user=user,
             filter_collection=filter,
             is_guest=requester.is_guest,
+            request_key=request_key,
         )
 
         if since is not None: