added proper django handling

open-contracting · Aug 11, 2021 · a64c608 · a64c608
1 parent 1e8eb18
commit a64c608
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 0 deletions.
diff --git a/process/management/commands/api_loader.py b/process/management/commands/api_loader.py
@@ -58,3 +58,4 @@ def process(self, connection, channel, delivery_tag, body):
 
         # confirm message processing
         self._ack(connection, channel, delivery_tag)
+        self._clean_thread_resources()
diff --git a/process/management/commands/base/worker.py b/process/management/commands/base/worker.py
@@ -7,6 +7,7 @@
 import pika
 from django.conf import settings
 from django.core.management.base import BaseCommand
+from django.db import connection as django_db_connection
 from django.utils.translation import gettext as t
 
 from process.models import Collection, CollectionFile, CollectionNote, ProcessingStep
@@ -156,6 +157,13 @@ def _publish_async_callback(self, channel, message, routing_key):
             )
         )
 
+    def _clean_thread_resources(self):
+        """
+            Cleans thread resources, which are not cleaned by default and automatically
+            i.e. django db connections.
+        """
+        django_db_connection.close()
+
     def _createStep(self, step_type=None, collection_id=None, collection_file_id=None, ocid=None):
         """Creates processing step"""
         processing_step = ProcessingStep()

diff --git a/process/management/commands/checker.py b/process/management/commands/checker.py
@@ -68,3 +68,4 @@ def process(self, connection, channel, delivery_tag, body):
                 self._exception("Failed saving collection note")
 
         self._ack(connection, channel, delivery_tag)
+        self._clean_thread_resources()
diff --git a/process/management/commands/compiler.py b/process/management/commands/compiler.py
@@ -83,6 +83,7 @@ def process(self, connection, channel, delivery_tag, body):
                 )
             except Exception:
                 self._exception("Failed saving collection note")
+        self._clean_thread_resources()
 
     def _publish_releases(self, connection, channel, collection):
         try:

diff --git a/process/management/commands/file_worker.py b/process/management/commands/file_worker.py
@@ -74,3 +74,5 @@ def process(self, connection, channel, delivery_tag, body):
 
             # confirm message processing
             self._ack(connection, channel, delivery_tag)
+
+        self._clean_thread_resources()
diff --git a/process/management/commands/finisher.py b/process/management/commands/finisher.py
@@ -60,3 +60,5 @@ def process(self, connection, channel, delivery_tag, body):
                 self._exception("Failed saving collection note")
 
         self._ack(connection, channel, delivery_tag)
+
+        self._clean_thread_resources()
diff --git a/process/management/commands/record_compiler.py b/process/management/commands/record_compiler.py
@@ -68,3 +68,4 @@ def process(self, connection, channel, delivery_tag, body):
                 self._exception("Failed saving collection note")
 
         self._ack(connection, channel, delivery_tag)
+        self._clean_thread_resources()
diff --git a/process/management/commands/release_compiler.py b/process/management/commands/release_compiler.py
@@ -64,3 +64,4 @@ def process(self, connection, channel, delivery_tag, body):
                 self._exception("Failed saving collection note")
 
         self._ack(connection, channel, delivery_tag)
+        self._clean_thread_resources()