Refactor handle_envelope

TK-IT · Jul 30, 2017 · 4806574 · 4806574
1 parent e0d2bbf
commit 4806574
Showing 1 changed file with 7 additions and 8 deletions.
diff --git 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 '[email protected]'