From 3173e096d92f3924ae4be46b8f3a8d1a6f755f69 Mon Sep 17 00:00:00 2001 From: Sabrina Demagny Date: Thu, 27 Mar 2025 15:41:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(dimail)=20enhance=20sentry=20log?= =?UTF-8?q?=20for=20dimail=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove duplicate sentry log and fix failure if response content has an unexpected format --- CHANGELOG.md | 1 + .../api/mail_domain/test_api_mail_domains_create.py | 2 +- .../tests/api/mailboxes/test_api_mailboxes_create.py | 2 +- src/backend/mailbox_manager/utils/dimail.py | 9 +-------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cad0e7..84c702c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to ### Fixed +- 🐛(dimail) enhance sentry log - 🐛(oauth2) force JWT signed for /userinfo #804 - 🐛(front) disable retries in useQuery and useInfiniteQuery #818 diff --git a/src/backend/mailbox_manager/tests/api/mail_domain/test_api_mail_domains_create.py b/src/backend/mailbox_manager/tests/api/mail_domain/test_api_mail_domains_create.py index 5838f42..b4c1dca 100644 --- a/src/backend/mailbox_manager/tests/api/mail_domain/test_api_mail_domains_create.py +++ b/src/backend/mailbox_manager/tests/api/mail_domain/test_api_mail_domains_create.py @@ -406,5 +406,5 @@ def test_api_mail_domains__no_creation_when_dimail_duplicate(caplog): assert record.levelname == "ERROR" assert ( record.message - == "[DIMAIL] unexpected error : 409 {'detail': 'Domain already exists'}" + == "[DIMAIL] unexpected error: 409 {'detail': 'Domain already exists'}" ) diff --git a/src/backend/mailbox_manager/tests/api/mailboxes/test_api_mailboxes_create.py b/src/backend/mailbox_manager/tests/api/mailboxes/test_api_mailboxes_create.py index 9863228..a69520d 100644 --- a/src/backend/mailbox_manager/tests/api/mailboxes/test_api_mailboxes_create.py +++ b/src/backend/mailbox_manager/tests/api/mailboxes/test_api_mailboxes_create.py @@ -721,7 +721,7 @@ def test_api_mailboxes__handling_dimail_unexpected_error(caplog): assert caplog.records[0].levelname == "ERROR" assert ( caplog.records[0].message - == "[DIMAIL] unexpected error : 500 {'detail': 'Internal server error'}" + == "[DIMAIL] unexpected error: 500 {'detail': 'Internal server error'}" ) diff --git a/src/backend/mailbox_manager/utils/dimail.py b/src/backend/mailbox_manager/utils/dimail.py index b319632..bbed1b0 100644 --- a/src/backend/mailbox_manager/utils/dimail.py +++ b/src/backend/mailbox_manager/utils/dimail.py @@ -251,15 +251,8 @@ class DimailAPIClient: except json.decoder.JSONDecodeError: error_content = response.content.decode(response.encoding) - logger.exception( - "[DIMAIL] unexpected error : %s %s", - response.status_code, - error_content, - exc_info=False, - ) raise requests.exceptions.HTTPError( - f"Unexpected response from dimail: {response.status_code} " - f"{error_content.get('detail') or error_content}" + f"[DIMAIL] unexpected error: {response.status_code} {error_content}" ) def notify_mailbox_creation(self, recipient, mailbox_data, issuer=None):