summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-10-25 15:21:08 +0100
committerErik Johnston <erik@matrix.org>2017-10-25 15:21:08 +0100
commit2a7e9faeec9af8723b9613fef3b3059b1fe777f5 (patch)
tree53d837f7fdbc2f1ab6ed7c4b1dc797efc60574ac /synapse/util
parentAdd logging and fix log contexts for publicRooms (diff)
downloadsynapse-2a7e9faeec9af8723b9613fef3b3059b1fe777f5.tar.xz
Do logcontexts outside ResponseCache
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/caches/response_cache.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/util/caches/response_cache.py b/synapse/util/caches/response_cache.py
index df0ae099c8..00af539880 100644
--- a/synapse/util/caches/response_cache.py
+++ b/synapse/util/caches/response_cache.py
@@ -13,7 +13,6 @@
 # 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
 
 
@@ -53,4 +52,4 @@ class ResponseCache(object):
             return r
 
         result.addBoth(remove)
-        return logcontext.make_deferred_yieldable(result.observe())
+        return result.observe()