diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-11-06 11:59:22 -0500 |
| commit | a5a59ab8ac6d6b244158261ee4d307d419b20180 (patch) | |
| tree | d809f7205647c13b93a103727dab6f4a19c878e4 /synapse/handlers/profile.py | |
| parent | fix merge conflict (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-a5a59ab8ac6d6b244158261ee4d307d419b20180.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_backup_hash
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) ) |