From 4b26fb3e6e1f5934edd58e94102b39ab9e6b7e91 Mon Sep 17 00:00:00 2001
From: feng <1304903146@qq.com>
Date: Mon, 21 Nov 2022 19:54:00 +0800
Subject: [PATCH] fix: jms upgrade_db bug

---
 apps/ops/signal_handlers.py         | 26 ++++++++++++++------------
 apps/orgs/signal_handlers/common.py |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/ops/signal_handlers.py b/apps/ops/signal_handlers.py
index dd49a4d94..965bd494c 100644
--- a/apps/ops/signal_handlers.py
+++ b/apps/ops/signal_handlers.py
@@ -1,14 +1,16 @@
 import ast
+from celery import signals
 
 from django.db import transaction
+from django.core.cache import cache
 from django.dispatch import receiver
+from django.db.utils import ProgrammingError
 from django.utils import translation, timezone
 from django.utils.translation import gettext as _
-from django.core.cache import cache
-from celery import signals, current_app
 
-from common.db.utils import close_old_connections, get_logger
 from common.signals import django_ready
+from common.db.utils import close_old_connections, get_logger
+
 from .celery import app
 from .models import CeleryTaskExecution, CeleryTask
 
@@ -23,15 +25,15 @@ def sync_registered_tasks(*args, **kwargs):
     with transaction.atomic():
         try:
             db_tasks = CeleryTask.objects.all()
-        except Exception as e:
-            return
-        celery_task_names = [key for key in app.tasks]
-        db_task_names = db_tasks.values_list('name', flat=True)
+            celery_task_names = [key for key in app.tasks]
+            db_task_names = db_tasks.values_list('name', flat=True)
 
-        db_tasks.exclude(name__in=celery_task_names).delete()
-        not_in_db_tasks = set(celery_task_names) - set(db_task_names)
-        tasks_to_create = [CeleryTask(name=name) for name in not_in_db_tasks]
-        CeleryTask.objects.bulk_create(tasks_to_create)
+            db_tasks.exclude(name__in=celery_task_names).delete()
+            not_in_db_tasks = set(celery_task_names) - set(db_task_names)
+            tasks_to_create = [CeleryTask(name=name) for name in not_in_db_tasks]
+            CeleryTask.objects.bulk_create(tasks_to_create)
+        except ProgrammingError:
+            pass
 
 
 @signals.before_task_publish.connect
@@ -45,7 +47,7 @@ def before_task_publish(headers=None, **kwargs):
 @signals.task_prerun.connect
 def on_celery_task_pre_run(task_id='', **kwargs):
     # 更新状态
-    CeleryTaskExecution.objects.filter(id=task_id)\
+    CeleryTaskExecution.objects.filter(id=task_id) \
         .update(state='RUNNING', date_start=timezone.now())
     # 关闭之前的数据库连接
     close_old_connections()
diff --git a/apps/orgs/signal_handlers/common.py b/apps/orgs/signal_handlers/common.py
index 2136b28a0..666f68fa1 100644
--- a/apps/orgs/signal_handlers/common.py
+++ b/apps/orgs/signal_handlers/common.py
@@ -7,6 +7,7 @@ from functools import partial
 import django.db.utils
 from django.dispatch import receiver
 from django.conf import settings
+from django.db.utils import ProgrammingError, OperationalError
 from django.utils.functional import LazyObject
 from django.db.models.signals import post_save, pre_delete, m2m_changed
 
@@ -48,7 +49,7 @@ def subscribe_orgs_mapping_expire(sender, **kwargs):
     if settings.DEBUG:
         try:
             set_to_default_org()
-        except django.db.utils.OperationalError:
+        except (ProgrammingError, OperationalError):
             pass
 
     def keep_subscribe_org_mapping():