From 48065743808231f9c1544c6c0b2cc37bc204a372 Mon Sep 17 00:00:00 2001 From: Mathias Rav Date: Sun, 30 Jul 2017 11:39:37 +0200 Subject: [PATCH] Refactor handle_envelope --- tutormail/server.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tutormail/server.py b/tutormail/server.py index 671acb3..6f77784 100644 --- a/tutormail/server.py +++ b/tutormail/server.py @@ -91,17 +91,16 @@ def reject(self, envelope): or 'Undelivered Mail Returned to Sender' in subject)) def handle_envelope(self, envelope, peer): - if self.reject(envelope): - description = summary = 'Rejected due to reject()' - self.store_failed_envelope(envelope, description, summary) - return - try: - result = super(TutorForwarder, self).handle_envelope(envelope, peer) - connection.close() - return result + if self.reject(envelope): + description = summary = 'Rejected due to reject()' + self.store_failed_envelope(envelope, description, summary) + return + return super(TutorForwarder, self).handle_envelope(envelope, peer) except ForwardToAdmin as e: self.forward_to_admin(envelope, e.args[0]) + finally: + connection.close() def get_envelope_mailfrom(self, envelope): return 'webfar@matfystutor.dk'