From f0ce95312280ef6e66a6d8d2bf22757af45d8e08 Mon Sep 17 00:00:00 2001
From: felixhjh <852142024@qq.com>
Date: Tue, 23 Nov 2021 15:21:17 +0000
Subject: [PATCH] add log_id intp error_catch

---
 python/pipeline/error_catch.py | 9 +++++++--
 python/pipeline/operator.py    | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/python/pipeline/error_catch.py b/python/pipeline/error_catch.py
index fe2f2531..f711b435 100644
--- a/python/pipeline/error_catch.py
+++ b/python/pipeline/error_catch.py
@@ -82,9 +82,14 @@ class ErrorCatch():
                 try:
                     res = func(*args, **kw)
                 except CustomException as e:
-                    log_id = self._id_generator.next()
+                    if "log_id" in kw.keys():
+                        log_id = kw["log_id"]
+                    elif "logid_dict" in kw.keys() and "data_id" in kw.keys():
+                        log_id = kw["logid_dict"].get(kw["data_id"])
+                    else:
+                        log_id = 0
                     resp = pipeline_service_pb2.Response()
-                    _LOGGER.error("\nLog_id: {}\n{}Classname: {}\nFunctionName:{}\nArgs:{}".format(log_id, traceback.format_exc(), func.__qualname__, func.__name__, args))
+                    _LOGGER.error("\nLog_id: {}\n{}Classname: {}\nFunctionName: {}\nArgs: {}".format(log_id, traceback.format_exc(), func.__qualname__, func.__name__, args))
                     split_list = re.split("\n|\t|:", str(e))
                     resp.err_no = int(split_list[3])
                     resp.err_msg = "Log_id: {}  ErrNo: {}  Error_msg: {}  ClassName: {}  FunctionName: {}".format(log_id, resp.err_no, split_list[9], func.__qualname__ ,func.__name__ )
diff --git a/python/pipeline/operator.py b/python/pipeline/operator.py
index e006990c..5f4112b8 100644
--- a/python/pipeline/operator.py
+++ b/python/pipeline/operator.py
@@ -813,7 +813,8 @@ class Op(object):
             is_skip_process = False
             prod_errcode, prod_errinfo = None, None
             log_id = logid_dict.get(data_id)
-            process_res, resp = preprocess_help(self, parsed_data, data_id, logid_dict)
+            process_res, resp = preprocess_help(self, parsed_data, data_id = data_id,
+            logid_dict = logid_dict)
             if resp.err_no == CustomExceptionCode.OK.value:
                 preped_data, is_skip_process, prod_errcode, prod_errinfo = process_res
                 if is_skip_process is True:
@@ -1102,7 +1103,8 @@ class Op(object):
             postped_data, err_channeldata = None, None
             prod_errcode, prod_errinfo = None, None
 
-            post_res, resp = postprocess_help(self, parsed_data_dict, midped_data, data_id, logid_dict)
+            post_res, resp = postprocess_help(self, parsed_data_dict, midped_data, data_id
+            = data_id, logid_dict = logid_dict)
             if resp.err_no == CustomExceptionCode.OK.value:
                 postped_data, prod_errcode, prod_errinfo = post_res
                 if prod_errcode is not None:
-- 
GitLab