Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logging and fix log contexts for publicRooms

This commit is contained in:
Erik Johnston 2017-10-25 10:26:06 +01:00
parent 9e2c22c97f
commit 33a9026cdf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/room_list.py
View File

@ -70,6 +70,7 @@ class RoomListHandler(BaseHandler):
if search_filter: if search_filter:
# We explicitly don't bother caching searches or requests for # We explicitly don't bother caching searches or requests for
# appservice specific lists. # appservice specific lists.
logger.info("Bypassing cache as search request.")
return self._get_public_room_list( return self._get_public_room_list(
limit, since_token, search_filter, network_tuple=network_tuple, limit, since_token, search_filter, network_tuple=network_tuple,
) )
@ -77,6 +78,7 @@ class RoomListHandler(BaseHandler):
key = (limit, since_token, network_tuple) key = (limit, since_token, network_tuple)
result = self.response_cache.get(key) result = self.response_cache.get(key)
if not result: if not result:
logger.info("No cached result, calculating one.")
result = self.response_cache.set( result = self.response_cache.set(
key, key,
self._get_public_room_list( self._get_public_room_list(

3
synapse/util/caches/response_cache.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.util import logcontext
from synapse.util.async import ObservableDeferred from synapse.util.async import ObservableDeferred
@ -52,4 +53,4 @@ class ResponseCache(object):
return r return r
result.addBoth(remove) result.addBoth(remove)
return result.observe() return logcontext.make_deferred_yieldable(result.observe())