diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-06 16:25:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-06 16:25:19 +0000 |
| commit | 5d43eaed61820a9ed0a8bccd1557824e29b1862d (patch) | |
| tree | c30be35ffe83152fcc25a8d135b07036aee72ed8 | |
| parent | Dial down logging for failed pushers (diff) | |
| parent | When setting display name more graciously handle failures to update room state. (diff) | |
| download | synapse-5d43eaed61820a9ed0a8bccd1557824e29b1862d.tar.xz | |
Merge branch 'develop' into release-v0.8.0
| -rw-r--r-- | synapse/handlers/profile.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py index 03b2159c53..2ddf9d5378 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py @@ -212,10 +212,16 @@ class ProfileHandler(BaseHandler): ) msg_handler = self.hs.get_handlers().message_handler - yield msg_handler.create_and_send_event({ - "type": EventTypes.Member, - "room_id": j.room_id, - "state_key": user.to_string(), - "content": content, - "sender": user.to_string() - }, ratelimit=False) + try: + yield msg_handler.create_and_send_event({ + "type": EventTypes.Member, + "room_id": j.room_id, + "state_key": user.to_string(), + "content": content, + "sender": user.to_string() + }, ratelimit=False) + except Exception as e: + logger.warn( + "Failed to update join event for room %s - %s", + j.room_id, str(e.message) + ) |