summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-25 10:26:06 +0100
committerErik Johnston <erik@matrix.org>2017-10-25 10:26:06 +0100
commit33a9026cdf19dc13a3492e838f0893755d380981 (patch)
tree10ad83ff6e0d1121bd8973d0088e70d2c48ac47e /synapse/util
parentMerge pull request #2567 from matrix-org/erikj/group_fed_update_profile (diff)
downloadsynapse-33a9026cdf19dc13a3492e838f0893755d380981.tar.xz
Add logging and fix log contexts for publicRooms
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/caches/response_cache.py3
1 files changed, 2 insertions, 1 deletions
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())