Update consumer.py

src/documents/consumer.py

@@ -468,7 +468,7 @@ class ConsumerPlugin(
         # now that everything is done, we can start to store the document
         # in the system. This will be a transaction and reasonably fast.
         success = False
-        result = None
+        store_exception = None
         try:
             with transaction.atomic():
                 # store the document.
@@ -535,18 +535,8 @@ class ConsumerPlugin(
                 document.save()
                 success = True
 
-        except Exception as e:
-            # save the exception for later
-            try:
-                self._fail(
-                    str(e),
-                    f"The following error occurred while storing document "
-                    f"{self.filename} after parsing: {e}",
-                    exc_info=True,
-                    exception=e,
-                )
         except Exception as fail_exc:
-                stored_exception = fail_exc
+            store_exception = fail_exc
         finally:
             if success:
                 # Delete the file only if it was successfully consumed
@@ -581,19 +571,26 @@ class ConsumerPlugin(
                 # Return the most up to date fields
                 document.refresh_from_db()
 
-                result = f"Success. New document id {document.pk} created"
+                document_parser.cleanup()
-            elif stored_exception:
+                tempdir.cleanup()
-                raise stored_exception
+                return f"Success. New document id {document.pk} created"
+            else:
+                document_parser.cleanup()
+                tempdir.cleanup()
+                if store_exception:
+                    self._fail(
+                        str(store_exception),
+                        f"The following error occurred while storing document "
+                        f"{self.filename} after parsing: {store_exception}",
+                        exc_info=True,
+                        exception=store_exception,
+                    )
                 else:
                     self._fail(
                         ConsumerStatusShortMessage.FAILED,
                         f"Error occurred while saving {self.filename}.",
                     )
 
-            document_parser.cleanup()
-            tempdir.cleanup()
-            return result
-
     def _parse_title_placeholders(self, title: str) -> str:
         local_added = timezone.localtime(timezone.now())
 

src/documents/tests/test_consumer.py

@@ -636,16 +636,9 @@ class TestConsumer(
     @mock.patch("documents.consumer.ConsumerPlugin._store")
     @mock.patch("documents.consumer.document_consumption_finished.send")
     @mock.patch("documents.consumer.generate_unique_filename")
-    def test_post_consume_fails_silently(self, m_filename, m_signal, m_store):
+    def testSaveFailsStillCaught(self, m_filename, m_signal, m_store):
-        """
-        If _store() returns None but no exception is raised, _fail should still be called.
-        """
         filename = self.get_test_file()
-
-        # Make _store() return None
         m_store.return_value = None
-
-        # Cause crash in a predictable, testable place
         m_filename.side_effect = AttributeError("BOOM")
 
         with self.get_consumer(filename) as consumer: