summary refs log tree commit diff
path: root/synapse/http/request_metrics.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-10-27 14:13:14 +0000
committerErik Johnston <erik@matrix.org>2020-10-27 14:13:14 +0000
commitbcb6b243e9e6d0d7c8744e152ed447cbbb58b32e (patch)
tree7c173749c83a7738042bd17786ca8d9f5bf7a9ec /synapse/http/request_metrics.py
parentMerge branch 'release-v1.22.0' into matrix-org-hotfixes (diff)
parentAdd admin API to list users' local media (#8647) (diff)
downloadsynapse-bcb6b243e9e6d0d7c8744e152ed447cbbb58b32e.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/request_metrics.py')
-rw-r--r--synapse/http/request_metrics.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/request_metrics.py b/synapse/http/request_metrics.py

index cd94e789e8..7c5defec82 100644 --- a/synapse/http/request_metrics.py +++ b/synapse/http/request_metrics.py
@@ -109,7 +109,7 @@ in_flight_requests_db_sched_duration = Counter( # The set of all in flight requests, set[RequestMetrics] _in_flight_requests = set() -# Protects the _in_flight_requests set from concurrent accesss +# Protects the _in_flight_requests set from concurrent access _in_flight_requests_lock = threading.Lock()