Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Starting metrics collection from sentinel context" errors (#9053)

Browse Source
This commit is contained in:
Erik Johnston 2021-01-08 14:33:53 +00:00 committed by GitHub
parent 12f79da587
commit a03d71dc9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9053.bugfix Normal file
View File

@ -0,0 +1 @@
Fix bug where we didn't correctly record CPU time spent in 'on_new_event' block.

1
synapse/notifier.py
View File

@ -396,7 +396,6 @@ class Notifier:
Will wake up all listeners for the given users and rooms. Will wake up all listeners for the given users and rooms.
""" """
with PreserveLoggingContext():
with Measure(self.clock, "on_new_event"): with Measure(self.clock, "on_new_event"):
user_streams = set() user_streams = set()

3
synapse/util/metrics.py
View File

@ -111,7 +111,8 @@ class Measure:
curr_context = current_context() curr_context = current_context()
if not curr_context: if not curr_context:
logger.warning( logger.warning(
"Starting metrics collection from sentinel context: metrics will be lost" "Starting metrics collection %r from sentinel context: metrics will be lost",
name,
) )
parent_context = None parent_context = None
else: else: