diff options
author | Aurélien Bompard <aurelien@bompard.org> | 2013-05-03 19:30:42 +0200 |
---|---|---|
committer | Aurélien Bompard <aurelien@bompard.org> | 2013-05-03 19:30:42 +0200 |
commit | 4b1df7bbdb0f0fa35cf738235aff8170a37b7d04 (patch) | |
tree | 6c1567d5dcb5a692a9a3b2cf5f5e29d7b1caf934 /hyperkitty | |
parent | 3123d2ed9220ab1103a800041e4e46d0f6fbf6c8 (diff) | |
download | hyperkitty-4b1df7bbdb0f0fa35cf738235aff8170a37b7d04.tar.gz hyperkitty-4b1df7bbdb0f0fa35cf738235aff8170a37b7d04.tar.xz hyperkitty-4b1df7bbdb0f0fa35cf738235aff8170a37b7d04.zip |
Handle errors when Mailman's REST server is down
Diffstat (limited to 'hyperkitty')
-rw-r--r-- | hyperkitty/lib/__init__.py | 17 | ||||
-rw-r--r-- | hyperkitty/lib/mailman.py | 37 | ||||
-rw-r--r-- | hyperkitty/templates/message_new.html | 7 | ||||
-rw-r--r-- | hyperkitty/views/message.py | 19 |
4 files changed, 65 insertions, 15 deletions
diff --git a/hyperkitty/lib/__init__.py b/hyperkitty/lib/__init__.py index 7ae9ee9..4acb7d1 100644 --- a/hyperkitty/lib/__init__.py +++ b/hyperkitty/lib/__init__.py @@ -27,6 +27,7 @@ from django.conf import settings from django.core.exceptions import SuspiciousOperation from django.core.mail import EmailMessage +from hyperkitty.lib import mailman FLASH_MESSAGES = { @@ -102,22 +103,18 @@ def daterange(start_date, end_date): yield start_date + datetime.timedelta(n) +class PostingFailed(Exception): pass + def post_to_list(request, mlist, subject, message, headers={}): if not mlist: # Make sure the list exists to avoid posting to any email addess raise SuspiciousOperation("I don't know this mailing-list") # Check that the user is subscribed - client = Client('%s/3.0' % settings.MAILMAN_REST_SERVER, - settings.MAILMAN_API_USER, settings.MAILMAN_API_PASS) - rest_list = client.get_list(mlist.name) try: - member = rest_list.get_member(request.user.email) - except ValueError: - # not subscribed yet, subscribe the user without email delivery - member = rest_list.subscribe(request.user.email, - "%s %s" % (request.user.first_name, request.user.last_name)) - member.preferences["delivery_status"] = "by_user" - member.preferences.save() + mailman.subscribe(mlist.name, request.user) + except mailman.MailmanConnectionError: + raise PostingFailed("Can't connect to Mailman's REST server, " + "your message has not been sent.") # send the message headers["User-Agent"] = "HyperKitty on %s" % request.build_absolute_uri("/") msg = EmailMessage( diff --git a/hyperkitty/lib/mailman.py b/hyperkitty/lib/mailman.py new file mode 100644 index 0000000..2bc245b --- /dev/null +++ b/hyperkitty/lib/mailman.py @@ -0,0 +1,37 @@ +#-*- coding: utf-8 -*- +# Copyright (C) 1998-2012 by the Free Software Foundation, Inc. +# +# This file is part of HyperKitty. +# +# HyperKitty is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# HyperKitty is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License along with +# HyperKitty. If not, see <http://www.gnu.org/licenses/>. +# +# Author: Aurelien Bompard <abompard@fedoraproject.org> +# + +from django.conf import settings +from mailmanclient import Client, MailmanConnectionError + + +def subscribe(list_address, user): + client = Client('%s/3.0' % settings.MAILMAN_REST_SERVER, + settings.MAILMAN_API_USER, settings.MAILMAN_API_PASS) + rest_list = client.get_list(list_address) + try: + member = rest_list.get_member(user.email) + except ValueError: + # not subscribed yet, subscribe the user without email delivery + member = rest_list.subscribe(user.email, + "%s %s" % (user.first_name, user.last_name)) + member.preferences["delivery_status"] = "by_user" + member.preferences.save() diff --git a/hyperkitty/templates/message_new.html b/hyperkitty/templates/message_new.html index 28231c8..7f10e77 100644 --- a/hyperkitty/templates/message_new.html +++ b/hyperkitty/templates/message_new.html @@ -22,6 +22,13 @@ Create a new thread - {{ mlist.display_name|default:mlist.name|escapeemail }} - <h1>Create a new thread</h1> </div> + {% if failure %} + <div class="alert alert-error"> + <button type="button" class="close" data-dismiss="alert">×</button> + {{ failure }} + </div> + {% endif %} + <div class="new-thread-form"> <form method="post" action="{% url 'message_new' mlist_fqdn=mlist.name %}"> diff --git a/hyperkitty/views/message.py b/hyperkitty/views/message.py index bb6f364..e526977 100644 --- a/hyperkitty/views/message.py +++ b/hyperkitty/views/message.py @@ -33,7 +33,7 @@ from django.core.exceptions import SuspiciousOperation from django.template import RequestContext, loader from django.contrib.auth.decorators import login_required -from hyperkitty.lib import get_store, get_months, post_to_list +from hyperkitty.lib import get_store, get_months, post_to_list, PostingFailed from hyperkitty.lib.voting import set_message_votes from hyperkitty.models import Rating from forms import SearchForm, ReplyForm, PostForm @@ -167,7 +167,10 @@ def reply(request, mlist_fqdn, message_id_hash): subject = "Re: %s" % subject headers = {"In-Reply-To": "<%s>" % message.message_id, "References": "<%s>" % message.message_id, } - post_to_list(request, mlist, subject, form.cleaned_data["message"], headers) + try: + post_to_list(request, mlist, subject, form.cleaned_data["message"], headers) + except PostingFailed, e: + return HttpResponse(str(e), content_type="text/plain", status=500) return HttpResponse("The reply has been sent successfully.", mimetype="text/plain") @@ -179,11 +182,10 @@ def new_message(request, mlist_fqdn): """ store = get_store(request) mlist = store.get_list(mlist_fqdn) + failure = None if request.method == 'POST': form = PostForm(request.POST) if form.is_valid(): - post_to_list(request, mlist, form.cleaned_data['subject'], - form.cleaned_data["message"]) today = datetime.date.today() redirect_url = reverse( 'archives_with_month', kwargs={ @@ -191,12 +193,19 @@ def new_message(request, mlist_fqdn): 'year': today.year, 'month': today.month}) redirect_url += "?msg=sent-ok" - return redirect(redirect_url) + try: + post_to_list(request, mlist, form.cleaned_data['subject'], + form.cleaned_data["message"]) + except PostingFailed, e: + failure = str(e) + else: + return redirect(redirect_url) else: form = PostForm() context = { "mlist": mlist, "post_form": form, + "failure": failure, 'months_list': get_months(store, mlist.name), } return render(request, "message_new.html", context) |