修复实例check返回连接状态错误bug fix #1179

common/check.py

@@ -129,7 +129,10 @@ def instance(request):
     try:
         engine = get_engine(instance=instance)
         engine.get_connection()
-        engine.get_all_databases()
+        dbs = engine.get_all_databases()
+        if dbs.error:
+            result['status'] = 1
+            result['msg'] = '无法连接实例,\n{}'.format(dbs.error)
     except Exception as e:
         result['status'] = 1
         result['msg'] = '无法连接实例,\n{}'.format(str(e))

common/tests.py

@@ -316,12 +316,13 @@ def testEmailCheck(self, send_email, mailsender):
     def testInstanceCheck(self, _get_engine, _conn):
         _get_engine.return_value.get_connection = _conn
         _get_engine.return_value.get_all_databases.return_value.rows.return_value = ResultSet(
-            rows=(('test1',), ('test2',)))
+            rows=((),),
+            error='Wrong password')
         c = Client()
         c.force_login(self.superuser1)
         r = c.post('/check/instance/', data={'instance_id': self.slave1.id})
         r_json = r.json()
-        self.assertEqual(r_json['status'], 0)
+        self.assertEqual(r_json['status'], 1)
 
     @patch('MySQLdb.connect')
     def test_inception_check(self, _conn):

sql/engines/redis.py

@@ -52,6 +52,7 @@ def get_all_databases(self, **kwargs):
         except Exception as e:
             logger.warning(f"Redis CONFIG GET databases 执行报错，异常信息：{e}")
             rows = 16
+            result.error = str(e)
 
         db_list = [str(x) for x in range(int(rows))]
         result.rows = db_list