mirror of
https://github.com/element-hq/synapse
synced 2024-09-12 02:25:10 +00:00
Add logging and fix log contexts for publicRooms
This commit is contained in:
parent
9e2c22c97f
commit
33a9026cdf
2 changed files with 4 additions and 1 deletions
|
@ -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(
|
||||||
|
|
|
@ -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())
|
||||||
|
|
Loading…
Reference in a new issue