From 23232cf88cd16418965e80b9d106d75c3e66ac77 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 15 Jul 2018 16:13:02 +0300 Subject: [PATCH] Don't crash on TimeoutError when initializing AS bot. Fixes #179 --- mautrix_telegram/matrix.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mautrix_telegram/matrix.py b/mautrix_telegram/matrix.py index 49dfa649..540fc39b 100644 --- a/mautrix_telegram/matrix.py +++ b/mautrix_telegram/matrix.py @@ -38,11 +38,17 @@ class MatrixHandler: async def init_as_bot(self): displayname = self.config["appservice.bot_displayname"] if displayname: - await self.az.intent.set_display_name(displayname if displayname != "remove" else "") + try: + await self.az.intent.set_display_name(displayname if displayname != "remove" else "") + except asyncio.TimeoutError: + self.log.exception("TimeoutError when trying to set displayname") avatar = self.config["appservice.bot_avatar"] if avatar: - await self.az.intent.set_avatar(avatar if avatar != "remove" else "") + try: + await self.az.intent.set_avatar(avatar if avatar != "remove" else "") + except asyncio.TimeoutError: + self.log.exception("TimeoutError when trying to set avatar") async def handle_puppet_invite(self, room, puppet, inviter): self.log.debug(f"{inviter} invited puppet for {puppet.tgid} to {room}")