Merge pull request #284 from the-maverick-lab/akshet/close-connection

Close connections after we are done with them

django_mailbox/models.py

@@ -470,15 +470,18 @@ class Mailbox(models.Model):
         connection = self.get_connection()
         if not connection:
             return
-        for message in connection.get_message(condition):
+        try:
-            msg = self.process_incoming_message(message)
+            for message in connection.get_message(condition):
-            if msg is not None:
+                msg = self.process_incoming_message(message)
-                yield msg
+                if msg is not None:
-        self.last_polling = now()
+                    yield msg
-        if django.VERSION >= (1, 5):  # Django 1.5 introduces update_fields
+            self.last_polling = now()
-            self.save(update_fields=['last_polling'])
+            if django.VERSION >= (1, 5):  # Django 1.5 introduces update_fields
-        else:
+                self.save(update_fields=['last_polling'])
-            self.save()
+            else:
+                self.save()
+        finally:
+            connection.close()
 
     @staticmethod
     def get_new_mail_all_mailboxes(args=None):

django_mailbox/transports/base.py

@@ -9,3 +9,6 @@ class EmailTransport:
         message = email.message_from_bytes(contents)
 
         return message
+
+    def close(self):
+        pass

django_mailbox/transports/imap.py

@@ -6,13 +6,6 @@ from django.conf import settings
 from .base import EmailTransport, MessageParseError
 
 
-# By default, imaplib will raise an exception if it encounters more
-# than 10k bytes; sometimes users attempt to consume mailboxes that
-# have a more, and modern computers are skookum-enough to handle just
-# a *few* more messages without causing any sort of problem.
-imaplib._MAXLINE = 1000000
-
-
 logger = logging.getLogger(__name__)
 
 
@@ -56,6 +49,14 @@ class ImapTransport(EmailTransport):
         else:
             self.server.select()
 
+    def close(self):
+        try:
+            self.server.close()
+            self.server.logout()
+        except (imaplib.IMAP4.error, OSError) as  e:
+            logger.warning(f'Failed to close IMAP connection, ignoring: {e}')
+            pass
+
     def _get_all_message_ids(self):
         # Fetch all the message uids
         response, message_ids = self.server.uid('search', None, 'ALL')