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/handlers/profile.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/handlers/profile.py')
-rw-r--r-- | synapse/handlers/profile.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 8690f69d45..22e0a04da4 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -275,7 +275,7 @@ class BaseProfileHandler(BaseHandler): ratelimit=False, # Try to hide that these events aren't atomic. ) except Exception as e: - logger.warn( + logger.warning( "Failed to update join event for room %s - %s", room_id, str(e) ) |