工单详情增加审核结果解析IndexError异常的处理

增加查询脱敏失败的日志记录
hhyo · Jun 22, 2019 · 794c982 · 794c982
1 parent e7b5f1b
commit 794c982
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/sql/query.py b/sql/query.py
@@ -122,11 +122,12 @@ def query(request):
                         query_result.error = None
                         priv_check = False
                         result['data'] = query_result.__dict__
+                    logger.error(f'数据脱敏异常，查询语句：{sql_content}\n，错误信息：{masking_result.error}')
                 # 正常脱敏
                 else:
                     result['data'] = masking_result.__dict__
             else:
-                logger.error(f'数据脱敏异常，查询语句：{sql_content}\n，错误信息：{traceback.format_exc()}')
+                logger.error(f'数据脱敏异常，查询语句：{sql_content}\n，错误信息：{query_masking_task.result}')
                 # 抛出未定义异常，并且开启query_check，直接返回异常，禁止执行
                 if config.get('query_check'):
                     result['status'] = 1

diff --git a/sql/views.py b/sql/views.py
@@ -135,6 +135,12 @@ def detail(request, workflow_id):
                 for r in loaded_rows:
                     review_result.rows += [ReviewResult(inception_result=r)]
                 rows = review_result.json()
+        except IndexError:
+            review_result.rows += [ReviewResult(
+                errormessage="Json decode failed."
+                             "执行结果Json解析失败, 请联系管理员"
+            )]
+            rows = review_result.json()
         except json.decoder.JSONDecodeError:
             review_result.rows += [ReviewResult(
                 # 迫于无法单元测试这里加上英文报错信息