diff --git a/python/pipeline/error_catch.py b/python/pipeline/error_catch.py index fe2f25311fc5d0335b340691ce42abafabb767be..f711b435002c99c03a0e9fdcc66bae4da14f8315 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 e006990c8ec468e777309d24a977f950e45aa7a2..5f4112b8d8ee238431fb2c0fbb1ea80d7b725026 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: