From cf4f29e848828da78756bad729142ed1bcefe810 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 18 Mar 2024 14:37:15 -0700 Subject: [PATCH] letsencrypt: Show better error messages Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/letsencrypt/views.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/plinth/modules/letsencrypt/views.py b/plinth/modules/letsencrypt/views.py index 5a946f680..2dbae35d2 100644 --- a/plinth/modules/letsencrypt/views.py +++ b/plinth/modules/letsencrypt/views.py @@ -12,7 +12,7 @@ from django.utils.translation import gettext as _ from django.views.decorators.http import require_POST from plinth.modules import letsencrypt -from plinth.views import AppView +from plinth.views import AppView, messages_error logger = logging.getLogger(__name__) @@ -41,10 +41,10 @@ def revoke(request, domain): 'This may take a few moments to take effect.').format( domain=domain)) except Exception as exception: - messages.error( + messages_error( request, - _('Failed to revoke certificate for domain {domain}: {error}'). - format(domain=domain, error=exception.args)) + _('Failed to revoke certificate for domain {domain}').format( + domain=domain), exception) return redirect(reverse_lazy('letsencrypt:index')) @@ -59,10 +59,11 @@ def obtain(request, domain): _('Certificate successfully obtained for domain {domain}').format( domain=domain)) except Exception as exception: - messages.error( + messages_error( request, - _('Failed to obtain certificate for domain {domain}: {error}'). - format(domain=domain, error=exception.args)) + _('Failed to obtain certificate for domain {domain}').format( + domain=domain), exception) + return redirect(reverse_lazy('letsencrypt:index')) @@ -76,10 +77,11 @@ def reobtain(request, domain): _('Certificate successfully obtained for domain {domain}').format( domain=domain)) except Exception as exception: - messages.error( + messages_error( request, - _('Failed to obtain certificate for domain {domain}: {error}'). - format(domain=domain, error=exception.args)) + _('Failed to obtain certificate for domain {domain}').format( + domain=domain), exception) + return redirect(reverse_lazy('letsencrypt:index')) @@ -93,9 +95,9 @@ def delete(request, domain): _('Certificate successfully deleted for domain {domain}').format( domain=domain)) except Exception as exception: - messages.error( + messages_error( request, - _('Failed to delete certificate for domain {domain}: {error}'). - format(domain=domain, error=exception.args)) + _('Failed to delete certificate for domain {domain}').format( + domain=domain), exception) return redirect(reverse_lazy('letsencrypt:index'))