Added database connection cleanup for cluster_daemon threads

cyllab · Apr 8, 2022 · c08dd4b · c08dd4b
1 parent c1b57b3
commit c08dd4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/frontend/cluster_daemon.py b/frontend/cluster_daemon.py
@@ -37,7 +37,7 @@
 from threading import Lock
 
 from django.utils.timezone import now
-
+from django.db import close_old_connections
 from django.conf import settings
 
 import code, traceback, signal, logging
@@ -246,6 +246,7 @@ def disconnect(self, access_id):
         access.save()
 
         logger.info(f"Disconnected cluster access {access_id}")
+        close_old_connections()
 
     def resume_calc(self, c, attempt_count=1):
 
@@ -271,6 +272,8 @@ def resume_calc(self, c, attempt_count=1):
         except KeyError:  # already deleted when disconnnected from cluster
             pass
 
+        close_old_connections()
+
     def process_command(self, body):
         lines = body.decode("UTF-8").split("&")
 

diff --git a/frontend/tasks.py b/frontend/tasks.py
@@ -3362,7 +3362,7 @@ def get_calc(calc_id):
 
         in_file = os.path.join(remote_dir, "in.xyz")
 
-    logger.info(f"Launching calc {calc_id}")
+    logger.info(f"Running calc {calc_id}")
     try:
         ret = f(in_file, calc)
     except Exception as e: