f69fc5fa by 冯轩

MOD:add log

1 parent 70735d1f
...@@ -2033,10 +2033,10 @@ class Command(BaseCommand, LoggerMixin): ...@@ -2033,10 +2033,10 @@ class Command(BaseCommand, LoggerMixin):
2033 # 更新OCR累计识别结果表 2033 # 更新OCR累计识别结果表
2034 if business_type == consts.HIL_PREFIX: 2034 if business_type == consts.HIL_PREFIX:
2035 result_class = HILOCRResult if is_ca else HILSEOCRResult 2035 result_class = HILOCRResult if is_ca else HILSEOCRResult
2036 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge) 2036 res_obj = atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str)
2037 else: 2037 else:
2038 result_class = AFCOCRResult if is_ca else AFCSEOCRResult 2038 result_class = AFCOCRResult if is_ca else AFCSEOCRResult
2039 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge) 2039 res_obj = atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str)
2040 2040
2041 except Exception as e: 2041 except Exception as e:
2042 self.online_log.error( 2042 self.online_log.error(
...@@ -2413,13 +2413,14 @@ class Command(BaseCommand, LoggerMixin): ...@@ -2413,13 +2413,14 @@ class Command(BaseCommand, LoggerMixin):
2413 self.online_log.info('{0} [stop safely]'.format(self.log_base)) 2413 self.online_log.info('{0} [stop safely]'.format(self.log_base))
2414 2414
2415 @transaction.atomic 2415 @transaction.atomic
2416 def atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge): 2416 def atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge,task_str):
2417 with transaction.atomic('afc'): 2417 with transaction.atomic('afc'):
2418 res_obj = result_class.objects.using('afc').select_for_update().filter(application_id=doc.application_id).first() 2418 res_obj = result_class.objects.using('afc').select_for_update().filter(application_id=doc.application_id).first()
2419 self.online_log.info('{0} [sql lock AFC application_id={1}]'.format(self.log_base, doc.application_id)) 2419 self.online_log.info('{0} [sql lock AFC application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2420 if res_obj is None: 2420 if res_obj is None:
2421 res_obj = result_class() 2421 res_obj = result_class()
2422 res_obj.application_id = doc.application_id 2422 res_obj.application_id = doc.application_id
2423 self.online_log.info('{0} [res_obj is None application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2423 for classify, field in consts.RESULT_MAPPING.items(): 2424 for classify, field in consts.RESULT_MAPPING.items():
2424 if not hasattr(res_obj, field): 2425 if not hasattr(res_obj, field):
2425 continue 2426 continue
...@@ -2441,17 +2442,18 @@ def atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge): ...@@ -2441,17 +2442,18 @@ def atomicSaveDBAFC(self,result_class,doc,license_summary,ic_merge,rp_merge):
2441 last_res_str = json.dumps(old_res_list) 2442 last_res_str = json.dumps(old_res_list)
2442 setattr(res_obj, field, last_res_str) 2443 setattr(res_obj, field, last_res_str)
2443 res_obj.save() 2444 res_obj.save()
2444 self.online_log.info('{0} [sql lock release application_id={1}]'.format(self.log_base, doc.application_id)) 2445 self.online_log.info('{0} [sql lock release application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2445 return res_obj 2446 return res_obj
2446 2447
2447 @transaction.atomic 2448 @transaction.atomic
2448 def atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge): 2449 def atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge, task_str):
2449 with transaction.atomic('default'): 2450 with transaction.atomic('default'):
2450 res_obj = result_class.objects.using('default').select_for_update().filter(application_id=doc.application_id).first() 2451 res_obj = result_class.objects.using('default').select_for_update().filter(application_id=doc.application_id).first()
2451 self.online_log.info('{0} [sql lock HIL application_id={1}]'.format(self.log_base, doc.application_id)) 2452 self.online_log.info('{0} [sql lock HIL application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2452 if res_obj is None: 2453 if res_obj is None:
2453 res_obj = result_class() 2454 res_obj = result_class()
2454 res_obj.application_id = doc.application_id 2455 res_obj.application_id = doc.application_id
2456 self.online_log.info('{0} [res_obj is None application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2455 for classify, field in consts.RESULT_MAPPING.items(): 2457 for classify, field in consts.RESULT_MAPPING.items():
2456 if not hasattr(res_obj, field): 2458 if not hasattr(res_obj, field):
2457 continue 2459 continue
...@@ -2473,5 +2475,5 @@ def atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge): ...@@ -2473,5 +2475,5 @@ def atomicSaveDBHIL(self,result_class,doc,license_summary,ic_merge,rp_merge):
2473 last_res_str = json.dumps(old_res_list) 2475 last_res_str = json.dumps(old_res_list)
2474 setattr(res_obj, field, last_res_str) 2476 setattr(res_obj, field, last_res_str)
2475 res_obj.save() 2477 res_obj.save()
2476 self.online_log.info('{0} [sql lock release application_id={1}]'.format(self.log_base, doc.application_id)) 2478 self.online_log.info('{0} [sql lock release application_id={1} doc_id={2}]'.format(self.log_base, doc.application_id,doc.id))
2477 return res_obj 2479 return res_obj
...\ No newline at end of file ...\ No newline at end of file
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!