数据库连接测试超时问题修改

app/utils/common_tools.py

@@ -7,42 +7,14 @@ from huansi_utils.app.apploader import logger
 from huansi_utils.exception.exception import HSException
 
 
-class CommonTools:
-    @classmethod
-    def validate_dict_value_all_not_none(cls, dict_data: dict, mapping=None):
-        '''
-        验证字典的值全不为空
-        :return:
-        '''
-        if not isinstance(dict_data, dict):
-            raise HSException('dict_data必须为字典类型')
-
-        for key, value in dict_data.items():
-            if value is None:
-                raise HSException(f"{key}不能为空")
-
-    # 超过四秒，基本上没救了，告辞~~~~
-    @timeout_decorator.timeout(2)
-    def test_db_connection(cls, ip: int, port: int, user_name: str, password: str, db_name: str):
-        '''
-        测试数据库连接
-        :param ip:
-        :param port:
-        :param user_name:
-        :param password:
-        :param db_name:
-        :param sql:
-        :return:
-        '''
+# 超过四秒，基本上没救了，告辞~~~~
+@timeout_decorator.timeout(2)
+def test_sql_connection(ip, port, user_name, password, db_name):
     from sqlalchemy import create_engine
     from sqlalchemy.orm import sessionmaker
-
     con_str = f'mssql+pymssql://{user_name}:{password}@{ip}:{port}/{db_name}'
-
     engine = create_engine(con_str)
-
     DBSession = sessionmaker(bind=engine)
-
     try:
         session = DBSession()
 
@@ -56,7 +28,7 @@ class CommonTools:
             return False
 
     except Exception as e:
-            if isinstance(e, TimeoutError):
+        if isinstance(e, timeout_decorator.TimeoutError):
             logger.error("数据库连接失败，失败原因：{}".format(e))
             return False
         orig = getattr(e, 'orig')
@@ -77,6 +49,34 @@ class CommonTools:
 
         return False
 
+
+class CommonTools:
+    @classmethod
+    def validate_dict_value_all_not_none(cls, dict_data: dict, mapping=None):
+        '''
+        验证字典的值全不为空
+        :return:
+        '''
+        if not isinstance(dict_data, dict):
+            raise HSException('dict_data必须为字典类型')
+
+        for key, value in dict_data.items():
+            if value is None:
+                raise HSException(f"{key}不能为空")
+
+    def test_db_connection(self, ip: int, port: int, user_name: str, password: str, db_name: str):
+        '''
+        测试数据库连接
+        :param ip:
+        :param port:
+        :param user_name:
+        :param password:
+        :param db_name:
+        :param sql:
+        :return:
+        '''
+        return test_sql_connection(ip, port, user_name, password, db_name)
+
     @classmethod
     def validate_runner_is_install(self):
         '''