Add logging and fix log contexts for publicRooms

2 files changed, 4 insertions, 1 deletions

diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
index 41e1781df7..ae7c611170 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -70,6 +70,7 @@ class RoomListHandler(BaseHandler):
         if search_filter:
             # We explicitly don't bother caching searches or requests for
             # appservice specific lists.
+            logger.info("Bypassing cache as search request.")
             return self._get_public_room_list(
                 limit, since_token, search_filter, network_tuple=network_tuple,
             )
@@ -77,6 +78,7 @@ class RoomListHandler(BaseHandler):
         key = (limit, since_token, network_tuple)
         result = self.response_cache.get(key)
         if not result:
+            logger.info("No cached result, calculating one.")
             result = self.response_cache.set(
                 key,
                 self._get_public_room_list(
diff --git a/synapse/util/caches/response_cache.py b/synapse/util/caches/response_cache.py
index 00af539880..df0ae099c8 100644
--- a/synapse/util/caches/response_cache.py
+++ b/synapse/util/caches/response_cache.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from synapse.util import logcontext
 from synapse.util.async import ObservableDeferred
 
 
@@ -52,4 +53,4 @@ class ResponseCache(object):
             return r
 
         result.addBoth(remove)
-        return result.observe()
+        return logcontext.make_deferred_yieldable(result.observe())