From dc2a6c6cd2a281b7d9e5d33d8e37d2f6b15d7e78 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 20 Oct 2017 18:40:46 +0200 Subject: [PATCH] [FIX] mail: shorten bounce message for sender --- addons/mail/models/mail_thread.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index af32d394332..a4a3097d998 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -827,11 +827,13 @@ class MailThread(models.AbstractModel): def _routing_warn(self, error_message, warn_suffix, message_id, route, raise_exception): """ Tools method used in message_route_verify: whether to log a warning or raise an error """ - full_message = _('Routing mail with Message-Id %s: route %s: %s') % (message_id, route, error_message) + short_message = _("Mailbox unavailable - %s") % error_message + full_message = ('Routing mail with Message-Id %s: route %s: %s' % + (message_id, route, error_message)) + _logger.info(full_message + (warn_suffix and '; %s' % warn_suffix or '')) if raise_exception: - raise ValueError(full_message) - else: - _logger.info(full_message + warn_suffix and '; %s' % warn_suffix or '') + # sender should not see private diagnostics info, just the error + raise ValueError(short_message) def _routing_create_bounce_email(self, email_from, body_html, message): bounce_to = tools.decode_message_header(message, 'Return-Path') or email_from