Fix download taxa list because interface closed (#4136)

kartoza · Aug 8, 2024 · 45c0612 · 45c0612
1 parent 2541302
commit 45c0612
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 11 deletions.
diff --git a/bims/database_backend/base.py b/bims/database_backend/base.py
@@ -1,11 +1,31 @@
+import time
+
 import django.db
-from psycopg2 import InterfaceError
+from psycopg2 import InterfaceError, OperationalError
 from django_tenants.postgresql_backend.base import (
  DatabaseWrapper as TenantDatabaseWrapper
 )
 
 
 class DatabaseWrapper(TenantDatabaseWrapper):
+ def _cursor(self, name=None):
+ try:
+ return super()._cursor(name)
+ except (OperationalError, InterfaceError) as e:
+ if 'connection already closed' in str(e):
+ self.close()
+ self.connect()
+ return super()._cursor(name)
+ else:
+ raise
+
+ def connect(self):
+ try:
+ super().connect()
+ except (OperationalError, InterfaceError):
+ time.sleep(1)
+ super().connect()
+
  def create_cursor(self, name=None):
  try:
  return super().create_cursor(name=name)

diff --git a/bims/tasks/email_csv.py b/bims/tasks/email_csv.py
@@ -3,7 +3,7 @@
 import zipfile
 
 from celery import shared_task
-from django.db import DatabaseError, connection, OperationalError
+from django.db import DatabaseError, connection, OperationalError, connections
 from openpyxl import load_workbook
 
 from bims.utils.domain import get_current_domain
@@ -54,7 +54,8 @@ def send_csv_via_email(
  download_request.save()
  except (DatabaseError, OperationalError):
  # Attempt to reconnect and save again
- connection.connect()
+ if not connections['default'].is_usable():
+ connections['default'].connect()
  download_request.save()
 
  email_template = 'csv_download/csv_created'

diff --git a/core/settings/contrib.py b/core/settings/contrib.py
@@ -40,7 +40,6 @@
  'grappelli',
  'django_tenants',
  'tenants',
- 'django_dbconn_retry',
 
  'colorfield',
  'polymorphic',

diff --git a/core/settings/dev_docker.py b/core/settings/dev_docker.py
@@ -39,7 +39,7 @@
 REPLICAS = extract_replicas(REPLICA_ENV_VAR)
 for index, replica in enumerate(REPLICAS, start=1):
  DATABASES[f'replica_{index}'] = {
- 'ENGINE': os.getenv('DB_ENGINE', 'django_tenants.postgresql_backend'),
+ 'ENGINE': 'bims.database_backend',
  'NAME': replica['NAME'],
  'USER': replica['USER'],
  'PASSWORD': replica['PASSWORD'],
@@ -73,7 +73,7 @@
  'debug_toolbar',
  ]
 
- MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+ # MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 
  DEBUG_TOOLBAR_CONFIG = {
  'SHOW_TOOLBAR_CALLBACK': lambda request: True,

diff --git a/core/settings/prod_docker.py b/core/settings/prod_docker.py
@@ -34,7 +34,7 @@
 REPLICAS = extract_replicas(REPLICA_ENV_VAR)
 for index, replica in enumerate(REPLICAS, start=1):
  DATABASES[f'replica_{index}'] = {
- 'ENGINE': os.getenv('DB_ENGINE', 'django_tenants.postgresql_backend'),
+ 'ENGINE': 'bims.database_backend',
  'NAME': replica['NAME'],
  'USER': replica['USER'],
  'PASSWORD': replica['PASSWORD'],

diff --git a/deployment/docker/REQUIREMENTS.txt b/deployment/docker/REQUIREMENTS.txt
@@ -96,5 +96,4 @@ openpyxl==3.1.2
 celery==5.3.6
 django-celery-results==2.5.1
 django-tenants==3.6.1
-tenant-schemas-celery==2.2.0
-git+https://github.com/dimasciput/django-dbconn-retry.git
+tenant-schemas-celery==2.2.0
diff --git a/deployment/production/REQUIREMENTS.txt b/deployment/production/REQUIREMENTS.txt
@@ -96,5 +96,4 @@ openpyxl==3.1.2
 celery==5.3.6
 django-celery-results==2.5.1
 django-tenants==3.6.1
-tenant-schemas-celery==2.2.0
-git+https://github.com/dimasciput/django-dbconn-retry.git
+tenant-schemas-celery==2.2.0