dandri/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-08-28 09:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3996 from matrix-org/erikj/fix_bg_iteration

Browse Source 
Fix exception in background metrics collection
This commit is contained in:
Erik Johnston
2018-10-03 14:14:38 +01:00
committed by GitHub
parent 01afcfc4e9 c69faf8c4a
commit 81e2813948
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelog.d/3996.bugfix
+1
View File
@@ -0,0 +1 @@
Fix exception in background metrics collection
synapse/metrics/background_process_metrics.py
+6 -2
View File
@@ -101,9 +101,13 @@ class _Collector(object):
labels=["name"],
)
# We copy the dict so that it doesn't change from underneath us
# We copy the dict so that it doesn't change from underneath us.
# We also copy the process lists as that can also change
with _bg_metrics_lock:
_background_processes_copy = dict(_background_processes)
_background_processes_copy = {
k: list(v)
for k, v in six.iteritems(_background_processes)
}
for desc, processes in six.iteritems(_background_processes_copy):
background_process_in_flight_count.add_metric(