summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-20 14:25:28 +0000
committerErik Johnston <erik@matrix.org>2019-03-20 14:25:28 +0000
commit7529038e66a81d36a71c654f26165a4215d918b3 (patch)
treea843cf4f230d80cfa7c5db0414529fe5d0245df2
parentFix up config comments (diff)
downloadsynapse-7529038e66a81d36a71c654f26165a4215d918b3.tar.xz
Return before we log
-rw-r--r--synapse/handlers/room_list.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py

index ba50c8aa95..dc54634107 100644 --- a/synapse/handlers/room_list.py +++ b/synapse/handlers/room_list.py
@@ -67,16 +67,17 @@ class RoomListHandler(BaseHandler): appservice and network id to use an appservice specific one. Setting to None returns all public rooms across all lists. """ - logger.info( - "Getting public room list: limit=%r, since=%r, search=%r, network=%r", - limit, since_token, bool(search_filter), network_tuple, - ) if not self.config.enable_room_list_search: return defer.succeed({ "chunk": [], "total_room_count_estimate": 0, }) + logger.info( + "Getting public room list: limit=%r, since=%r, search=%r, network=%r", + limit, since_token, bool(search_filter), network_tuple, + ) + if search_filter: # We explicitly don't bother caching searches or requests for # appservice specific lists.