Merge pull request #8957 from jumpserver/dev

v2.27.0-rc1

apps/terminal/signal_handlers.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 from django.db.models.signals import post_save, post_delete
+from django.db.utils import ProgrammingError
 
 from common.signals import django_ready
 from django.dispatch import receiver
@@ -17,7 +18,10 @@ logger = get_logger(__file__)
 @receiver(django_ready)
 def init_db_port_mapper(sender, **kwargs):
     logger.info('Init db port mapper')
-    db_port_manager.init()
+    try:
+        db_port_manager.init()
+    except (ProgrammingError,) as e:
+        logger.error('Init db port mapper error: {}'.format(e))
 
 
 @receiver(post_save, sender=Application)

requirements/requirements.txt

@@ -4,7 +4,7 @@ asn1crypto==0.24.0
 bcrypt==3.1.4
 billiard==3.6.4.0
 certifi==2018.1.18
-cffi==1.13.2
+cffi==1.15.1
 chardet==3.0.4
 configparser==3.5.0
 decorator==4.1.2