diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-11-05 17:08:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-05 17:08:07 +0000 |
| commit | 55a7da247a912ca2a4d539a63200fca0d6541f46 (patch) | |
| tree | c0445991317e3dc26def157bfeb70d76d1b830c5 /synapse/logging | |
| parent | Apply suggestions from code review (diff) | |
| parent | Improve documentation for EventContext fields (#6319) (diff) | |
| download | synapse-55a7da247a912ca2a4d539a63200fca0d6541f46.tar.xz | |
Merge branch 'develop' into rav/url_preview_limit_title
Diffstat (limited to 'synapse/logging')
| -rw-r--r-- | synapse/logging/_structured.py | 2 | ||||
| -rw-r--r-- | synapse/logging/context.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/logging/_structured.py b/synapse/logging/_structured.py index 3220e985a9..334ddaf39a 100644 --- a/synapse/logging/_structured.py +++ b/synapse/logging/_structured.py @@ -185,7 +185,7 @@ DEFAULT_LOGGERS = {"synapse": {"level": "INFO"}} def parse_drain_configs( - drains: dict + drains: dict, ) -> typing.Generator[DrainConfiguration, None, None]: """ Parse the drain configurations. diff --git a/synapse/logging/context.py b/synapse/logging/context.py index 370000e377..2c1fb9ddac 100644 --- a/synapse/logging/context.py +++ b/synapse/logging/context.py @@ -294,7 +294,7 @@ class LoggingContext(object): """Enters this logging context into thread local storage""" old_context = self.set_current_context(self) if self.previous_context != old_context: - logger.warn( + logger.warning( "Expected previous context %r, found %r", self.previous_context, old_context, |