From 981b4a787a19c26a40baeec4e167244162068c21 Mon Sep 17 00:00:00 2001 From: b3yond Date: Mon, 8 Jul 2019 22:33:25 +0200 Subject: [PATCH 1/4] more detailed Mastodon 5xx error messages --- active_bots/mastodonbot.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/active_bots/mastodonbot.py b/active_bots/mastodonbot.py index a262a21..0f50b74 100755 --- a/active_bots/mastodonbot.py +++ b/active_bots/mastodonbot.py @@ -25,9 +25,22 @@ class MastodonBot(Bot): return mentions try: notifications = m.notifications() - except mastodon.MastodonServerError: + logger.error(m.instance()['urls']['streaming_api']) + except mastodon.MastodonInternalServerError: + logger.error("Unknown Mastodon API Error: 500. Server: " + m.instance()['urls']) + return mentions + except mastodon.MastodonBadGatewayError: logger.error("Unknown Mastodon API Error: 502") return mentions + except mastodon.MastodonServiceUnavailableError: + logger.error("Unknown Mastodon API Error: 503") + return mentions + except mastodon.MastodonGatewayTimeoutError: + logger.error("Unknown Mastodon API Error: 504") + return mentions + except mastodon.MastodonServerError: + logger.error("Unknown Mastodon Server Error") + return mentions for status in notifications: if (status['type'] == 'mention' and not user.toot_is_seen(status['status']['uri'])): From 76d758d11ca2f40e34feb5aec16b2623b45fc2e6 Mon Sep 17 00:00:00 2001 From: b3yond Date: Mon, 8 Jul 2019 23:09:32 +0200 Subject: [PATCH 2/4] added the server URL to masto server errors --- active_bots/mastodonbot.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/active_bots/mastodonbot.py b/active_bots/mastodonbot.py index 0f50b74..7859ff7 100755 --- a/active_bots/mastodonbot.py +++ b/active_bots/mastodonbot.py @@ -25,21 +25,20 @@ class MastodonBot(Bot): return mentions try: notifications = m.notifications() - logger.error(m.instance()['urls']['streaming_api']) except mastodon.MastodonInternalServerError: - logger.error("Unknown Mastodon API Error: 500. Server: " + m.instance()['urls']) + logger.error("Unknown Mastodon API Error: 500. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonBadGatewayError: - logger.error("Unknown Mastodon API Error: 502") + logger.error("Unknown Mastodon API Error: 502. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonServiceUnavailableError: - logger.error("Unknown Mastodon API Error: 503") + logger.error("Unknown Mastodon API Error: 503. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonGatewayTimeoutError: - logger.error("Unknown Mastodon API Error: 504") + logger.error("Unknown Mastodon API Error: 504. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonServerError: - logger.error("Unknown Mastodon Server Error") + logger.error("Unknown Mastodon Server Error. Server: " + m.instance()['urls']['streaming_api']) return mentions for status in notifications: if (status['type'] == 'mention' and From 87bca89efa6842bec6bec0f05229e41a6da20395 Mon Sep 17 00:00:00 2001 From: b3yond Date: Fri, 9 Aug 2019 15:21:49 +0200 Subject: [PATCH 3/4] added backtrace to general error message --- active_bots/mastodonbot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/active_bots/mastodonbot.py b/active_bots/mastodonbot.py index 7859ff7..f577e20 100755 --- a/active_bots/mastodonbot.py +++ b/active_bots/mastodonbot.py @@ -21,7 +21,7 @@ class MastodonBot(Bot): try: m = mastodon.Mastodon(*user.get_masto_credentials()) except TypeError: - # logger.error("No Mastodon Credentials in database.", exc_info=True) + # No Mastodon Credentials in database. return mentions try: notifications = m.notifications() @@ -38,7 +38,7 @@ class MastodonBot(Bot): logger.error("Unknown Mastodon API Error: 504. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonServerError: - logger.error("Unknown Mastodon Server Error. Server: " + m.instance()['urls']['streaming_api']) + logger.error("Unknown Mastodon Server Error. Server: " + m.instance()['urls']['streaming_api'], exc_info=True) return mentions for status in notifications: if (status['type'] == 'mention' and From 59f10c50f27124bfe10b8f7df51503115f54ce79 Mon Sep 17 00:00:00 2001 From: b3yond Date: Fri, 9 Aug 2019 15:29:51 +0200 Subject: [PATCH 4/4] those errors are not unknown of course. --- active_bots/mastodonbot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/active_bots/mastodonbot.py b/active_bots/mastodonbot.py index f577e20..4ac8f5e 100755 --- a/active_bots/mastodonbot.py +++ b/active_bots/mastodonbot.py @@ -26,16 +26,16 @@ class MastodonBot(Bot): try: notifications = m.notifications() except mastodon.MastodonInternalServerError: - logger.error("Unknown Mastodon API Error: 500. Server: " + m.instance()['urls']['streaming_api']) + logger.error("Mastodon Error: 500. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonBadGatewayError: - logger.error("Unknown Mastodon API Error: 502. Server: " + m.instance()['urls']['streaming_api']) + logger.error("Mastodon Error: 502. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonServiceUnavailableError: - logger.error("Unknown Mastodon API Error: 503. Server: " + m.instance()['urls']['streaming_api']) + logger.error("Mastodon Error: 503. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonGatewayTimeoutError: - logger.error("Unknown Mastodon API Error: 504. Server: " + m.instance()['urls']['streaming_api']) + logger.error("Mastodon Error: 504. Server: " + m.instance()['urls']['streaming_api']) return mentions except mastodon.MastodonServerError: logger.error("Unknown Mastodon Server Error. Server: " + m.instance()['urls']['streaming_api'], exc_info=True)