diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
| commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
| tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/logging/context.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
| download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/logging/context.py')
| -rw-r--r-- | synapse/logging/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |