summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-12 12:59:36 +0100
committerGitHub <noreply@github.com>2018-04-12 12:59:36 +0100
commitd5c74b9f6c68cc49eb689c76d38c0903d48219e2 (patch)
tree1f1abc9fd8982b24c056ac92d68617297e3b263b /synapse/handlers
parentMerge pull request #3090 from matrix-org/erikj/processed_event_lag (diff)
parentAdd metrics for ResponseCache (diff)
downloadsynapse-d5c74b9f6c68cc49eb689c76d38c0903d48219e2.tar.xz
Merge pull request #3092 from matrix-org/rav/response_cache_metrics
Add metrics for ResponseCache
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_list.py5
-rw-r--r--synapse/handlers/sync.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py

index 5d81f59b44..8028d793c2 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py
@@ -44,8 +44,9 @@ EMTPY_THIRD_PARTY_ID = ThirdPartyInstanceID(None, None) class RoomListHandler(BaseHandler): def __init__(self, hs): super(RoomListHandler, self).__init__(hs) - self.response_cache = ResponseCache(hs) - self.remote_response_cache = ResponseCache(hs, timeout_ms=30 * 1000) + self.response_cache = ResponseCache(hs, "room_list") + self.remote_response_cache = ResponseCache(hs, "remote_room_list", + timeout_ms=30 * 1000) def get_local_public_room_list(self, limit=None, since_token=None, search_filter=None, diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 0f713ce038..06d17ab20c 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py
@@ -169,7 +169,7 @@ class SyncHandler(object): self.presence_handler = hs.get_presence_handler() self.event_sources = hs.get_event_sources() self.clock = hs.get_clock() - self.response_cache = ResponseCache(hs) + self.response_cache = ResponseCache(hs, "sync") self.state = hs.get_state_handler() def wait_for_sync_for_user(self, sync_config, since_token=None, timeout=0,