Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
c7cdc7fa by 冯轩
Options

MOD:try exception

1 parent f6883dc4
Inline Side-by-side
Showing 1 changed file with 26 additions and 14 deletions
src/celery_compare/tasks.py
...@@ -3668,11 +3668,16 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res ...@@ -3668,11 +3668,16 @@ def se_compare(application_id, application_entity, ocr_res_id, last_obj, ocr_res
3668 try: 3668 try:
3669 compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id)) 3669 compare_log.info('{0} [SE] [cms sleep start] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
3670 # 实时查询延迟时间 3670 # 实时查询延迟时间
3671 try:
3671 cms_delay_time_config = Configs.objects.filter(id=5).first() 3672 cms_delay_time_config = Configs.objects.filter(id=5).first()
3672 if cms_delay_time_config is not None and cms_delay_time_config.value is not None and cms_delay_time_config.value.isdigit(): 3673 if cms_delay_time_config is not None and cms_delay_time_config.value is not None and cms_delay_time_config.value.isdigit():
3673 cms_delay_time = cms_delay_time_config.value 3674 cms_delay_time = cms_delay_time_config.value
3674 else: 3675 else:
3675 cms_delay_time = 0 3676 cms_delay_time = 0
3677 except Exception as e:
3678 cms_delay_time = 0
3679 compare_log.info('[get cms_delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
3680
3676 compare_log.info('cms_delay_time:{0}'.format(cms_delay_time)) 3681 compare_log.info('cms_delay_time:{0}'.format(cms_delay_time))
3677 time.sleep(int(cms_delay_time)) 3682 time.sleep(int(cms_delay_time))
3678 compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id)) 3683 compare_log.info('{0} [SE] [cms sleep end] [entity={1}] [id={2}] '.format(log_base, application_entity, application_id))
...@@ -3716,20 +3721,23 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, ...@@ -3716,20 +3721,23 @@ def fsm_compare_thread(application_id, application_entity, uniq_seq, ocr_res_id,
3716 '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, 3721 '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
3717 is_ca, is_cms)) 3722 is_ca, is_cms))
3718 3723
3724 # 查看此订单号下是否有未完成的文件，如果有，等1分钟
3725 doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
3726 doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
3727 compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
3728 compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
3729 if doc_wait_file_result is not None:
3719 # 实时查询延迟时间 3730 # 实时查询延迟时间
3731 try:
3720 delay_time_config = Configs.objects.filter(id=4).first() 3732 delay_time_config = Configs.objects.filter(id=4).first()
3721 if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit(): 3733 if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
3722 delay_time = delay_time_config.value 3734 delay_time = delay_time_config.value
3723 else: 3735 else:
3724 delay_time = 0 3736 delay_time = 0
3737 except Exception as e:
3738 delay_time = 0
3739 compare_log.info('[get delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
3725 compare_log.info('delay_time:{0}'.format(delay_time)) 3740 compare_log.info('delay_time:{0}'.format(delay_time))
3726
3727 # 查看此订单号下是否有未完成的文件，如果有，等1分钟
3728 doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
3729 doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
3730 compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
3731 compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
3732 if doc_wait_file_result is not None:
3733 compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) 3741 compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
3734 time.sleep(int(delay_time)) 3742 time.sleep(int(delay_time))
3735 compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) 3743 compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
...@@ -3777,20 +3785,24 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_ ...@@ -3777,20 +3785,24 @@ def compare_thread(application_id, application_entity, uniq_seq, ocr_res_id, is_
3777 compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] ' 3785 compare_log.info('{0} [receive task] [entity={1}] [id={2}] [uniq_seq={3}] [ocr_res_id={4}] [is_ca={5}] '
3778 '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id, 3786 '[is_cms={6}]'.format(log_base, application_entity, application_id, uniq_seq, ocr_res_id,
3779 is_ca, is_cms)) 3787 is_ca, is_cms))
3788
3789 # 查看此订单号下是否有未完成的文件，如果有，等?分钟
3790 doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
3791 doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
3792 compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
3793 compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
3794 if doc_wait_file_result is not None:
3780 # 实时查询延迟时间 3795 # 实时查询延迟时间
3796 try:
3781 delay_time_config = Configs.objects.filter(id=4).first() 3797 delay_time_config = Configs.objects.filter(id=4).first()
3782 if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit(): 3798 if delay_time_config is not None and delay_time_config.value is not None and delay_time_config.value.isdigit():
3783 delay_time = delay_time_config.value 3799 delay_time = delay_time_config.value
3784 else: 3800 else:
3785 delay_time = 0 3801 delay_time = 0
3802 except Exception as e:
3803 delay_time = 0
3804 compare_log.info('[get delay_time_config fail] [error={0}]'.format(traceback.format_exc()))
3786 compare_log.info('delay_time:{0}'.format(delay_time)) 3805 compare_log.info('delay_time:{0}'.format(delay_time))
3787
3788 # 查看此订单号下是否有未完成的文件，如果有，等1分钟
3789 doc_wait_file_class = HILDoc if application_entity == consts.HIL_PREFIX else AFCDoc
3790 doc_wait_file_result = doc_wait_file_class.objects.filter(application_id=application_id, status=1).first()
3791 compare_log.info('doc_wait_file_result:{0}'.format(doc_wait_file_result))
3792 compare_log.info('{0} [comparison unfinished file check] [entity={1}] [id={2}] [doc_wait_file_result={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result))
3793 if doc_wait_file_result is not None:
3794 compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) 3806 compare_log.info('{0} [comparison unfinished file wait delay_time start] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
3795 time.sleep(int(delay_time)) 3807 time.sleep(int(delay_time))
3796 compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id)) 3808 compare_log.info('{0} [comparison unfinished file wait delay_time end] [entity={1}] [id={2}] [doc_id={3}]'.format(log_base, application_entity, application_id, doc_wait_file_result.id))
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!