Skip to content

周伟奇 / bmw-ocr

Go to a project
Toggle navigation
Toggle navigation pinning
b34cd942 by 周伟奇
Options

add folder log

1 parent 15ebcd41
Inline Side-by-side
Showing 3 changed files with 28 additions and 15 deletions
src/apps/doc/management/commands/folder_ocr_process.py
...@@ -95,7 +95,7 @@ class Command(BaseCommand, LoggerMixin): ...@@ -95,7 +95,7 @@ class Command(BaseCommand, LoggerMixin):
95 wb.simple_license_rebuild(license_summary, consts.DOC_SCHEME_LIST[0]) 95 wb.simple_license_rebuild(license_summary, consts.DOC_SCHEME_LIST[0])
96 wb.save(excel_path) 96 wb.save(excel_path)
97 except Exception as e: 97 except Exception as e:
98 self.cronjob_log.error('{0} [wb build error] [path={1}] [error={2}]'.format( 98 self.folder_log.error('{0} [wb build error] [path={1}] [error={2}]'.format(
99 self.log_base, excel_path, traceback.format_exc())) 99 self.log_base, excel_path, traceback.format_exc()))
100 100
101 def ocr_process(self, img_path, classify): 101 def ocr_process(self, img_path, classify):
...@@ -117,28 +117,28 @@ class Command(BaseCommand, LoggerMixin): ...@@ -117,28 +117,28 @@ class Command(BaseCommand, LoggerMixin):
117 if ocr_response.status_code != 200: 117 if ocr_response.status_code != 200:
118 raise OCR1Exception('{0} ocr status code: {0}'.format(self.log_base, ocr_response.status_code)) 118 raise OCR1Exception('{0} ocr status code: {0}'.format(self.log_base, ocr_response.status_code))
119 except Exception as e: 119 except Exception as e:
120 self.cronjob_log.warn('{0} [ocr failed] [times={1}] [img_path={2}] [error={3}]'.format( 120 self.folder_log.warn('{0} [ocr failed] [times={1}] [img_path={2}] [error={3}]'.format(
121 self.log_base, times, img_path, traceback.format_exc())) 121 self.log_base, times, img_path, traceback.format_exc()))
122 else: 122 else:
123 ocr_res = ocr_response.json() 123 ocr_res = ocr_response.json()
124 end_time = time.time() 124 end_time = time.time()
125 speed_time = int(end_time - start_time) 125 speed_time = int(end_time - start_time)
126 self.cronjob_log.info('{0} [ocr success] [img={1}] [res={2}] [speed_time={3}]'.format( 126 self.folder_log.info('{0} [ocr success] [img={1}] [res={2}] [speed_time={3}]'.format(
127 self.log_base, img_path, ocr_res, speed_time)) 127 self.log_base, img_path, ocr_res, speed_time))
128 return ocr_res 128 return ocr_res
129 else: 129 else:
130 self.cronjob_log.warn('{0} [ocr failed] [img_path={1}]'.format(self.log_base, img_path)) 130 self.folder_log.warn('{0} [ocr failed] [img_path={1}]'.format(self.log_base, img_path))
131 131
132 def pdf_process(self, name, path, classify, img_output_dir, wb_output_dir, pdf_output_dir): 132 def pdf_process(self, name, path, classify, img_output_dir, wb_output_dir, pdf_output_dir):
133 if os.path.exists(path): 133 if os.path.exists(path):
134 try: 134 try:
135 img_save_path, excel_path, pdf_save_path = self.get_path(name, img_output_dir, wb_output_dir, pdf_output_dir) 135 img_save_path, excel_path, pdf_save_path = self.get_path(name, img_output_dir, wb_output_dir, pdf_output_dir)
136 self.cronjob_log.info('{0} [pdf to img start] [path={1}]'.format(self.log_base, path)) 136 self.folder_log.info('{0} [pdf to img start] [path={1}]'.format(self.log_base, path))
137 pdf_handler = PDFHandler(path, img_save_path) 137 pdf_handler = PDFHandler(path, img_save_path)
138 pdf_handler.extract_image() 138 pdf_handler.extract_image()
139 self.cronjob_log.info('{0} [pdf to img end] [path={1}]'.format(self.log_base, path)) 139 self.folder_log.info('{0} [pdf to img end] [path={1}]'.format(self.log_base, path))
140 except Exception as e: 140 except Exception as e:
141 self.cronjob_log.error('{0} [pdf to img error] [path={1}] [error={2}]'.format( 141 self.folder_log.error('{0} [pdf to img error] [path={1}] [error={2}]'.format(
142 self.log_base, path, traceback.format_exc())) 142 self.log_base, path, traceback.format_exc()))
143 else: 143 else:
144 all_res = {} 144 all_res = {}
...@@ -155,7 +155,7 @@ class Command(BaseCommand, LoggerMixin): ...@@ -155,7 +155,7 @@ class Command(BaseCommand, LoggerMixin):
155 try: 155 try:
156 img_save_path, excel_path, _ = self.get_path(name, img_output_dir, wb_output_dir, pdf_output_dir) 156 img_save_path, excel_path, _ = self.get_path(name, img_output_dir, wb_output_dir, pdf_output_dir)
157 except Exception as e: 157 except Exception as e:
158 self.cronjob_log.error('{0} [get path error] [path={1}] [error={2}]'.format( 158 self.folder_log.error('{0} [get path error] [path={1}] [error={2}]'.format(
159 self.log_base, path, traceback.format_exc())) 159 self.log_base, path, traceback.format_exc()))
160 else: 160 else:
161 self.res_process(all_res, classify, excel_path) 161 self.res_process(all_res, classify, excel_path)
...@@ -174,17 +174,17 @@ class Command(BaseCommand, LoggerMixin): ...@@ -174,17 +174,17 @@ class Command(BaseCommand, LoggerMixin):
174 # 1. 从input dir获取pdf or image 174 # 1. 从input dir获取pdf or image
175 list_dir = os.listdir(input_dir) 175 list_dir = os.listdir(input_dir)
176 if not list_dir: 176 if not list_dir:
177 self.cronjob_log.info('{0} [input dir empty] [input_dir={1}]'.format(self.log_base, input_dir)) 177 self.folder_log.info('{0} [input dir empty] [input_dir={1}]'.format(self.log_base, input_dir))
178 time.sleep(self.sleep_time) 178 time.sleep(self.sleep_time)
179 for name in list_dir: 179 for name in list_dir:
180 path = os.path.join(input_dir, name) 180 path = os.path.join(input_dir, name)
181 if os.path.isfile(path): 181 if os.path.isfile(path):
182 self.cronjob_log.info('{0} [file start] [path={1}]'.format(self.log_base, path)) 182 self.folder_log.info('{0} [file start] [path={1}]'.format(self.log_base, path))
183 if name.endswith('.pdf'): 183 if name.endswith('.pdf'):
184 self.pdf_process(name, path, classify, img_output_dir, wb_output_dir, pdf_output_dir) 184 self.pdf_process(name, path, classify, img_output_dir, wb_output_dir, pdf_output_dir)
185 else: 185 else:
186 self.img_process(name, path, classify, wb_output_dir, img_output_dir, pdf_output_dir) 186 self.img_process(name, path, classify, wb_output_dir, img_output_dir, pdf_output_dir)
187 self.cronjob_log.info('{0} [file end] [path={1}]'.format(self.log_base, path)) 187 self.folder_log.info('{0} [file end] [path={1}]'.format(self.log_base, path))
188 188
189 def handle(self, *args, **kwargs): 189 def handle(self, *args, **kwargs):
190 process_list = [] 190 process_list = []
...@@ -198,4 +198,4 @@ class Command(BaseCommand, LoggerMixin): ...@@ -198,4 +198,4 @@ class Command(BaseCommand, LoggerMixin):
198 for p in process_list: 198 for p in process_list:
199 p.join() 199 p.join()
200 200
201 self.cronjob_log.info('{0} [stop safely]'.format(self.log_base)) 201 self.folder_log.info('{0} [stop safely]'.format(self.log_base))
......
src/common/mixins.py
...@@ -39,6 +39,7 @@ class LoggerMixin: ...@@ -39,6 +39,7 @@ class LoggerMixin:
39 running_log = logging.getLogger('running') 39 running_log = logging.getLogger('running')
40 exception_log = logging.getLogger('exception') 40 exception_log = logging.getLogger('exception')
41 cronjob_log = logging.getLogger('cronjob') 41 cronjob_log = logging.getLogger('cronjob')
42 folder_log = logging.getLogger('folder')
42 43
43 44
44 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView): 45 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView):
......
src/settings/conf/logging.conf
1 [loggers] 1 [loggers]
2 keys=root, running, exception, cronjob, django.db.backends 2 keys=root, running, exception, cronjob, folder, django.db.backends
3 3
4 [handlers] 4 [handlers]
5 keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, djangodbFileHandler 5 keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, folderFileHandler, djangodbFileHandler
6 6
7 [formatters] 7 [formatters]
8 keys=SituFormatter, dataLogFormatter 8 keys=SituFormatter, dataLogFormatter
...@@ -37,7 +37,13 @@ args=('../logs/exception.log',) ...@@ -37,7 +37,13 @@ args=('../logs/exception.log',)
37 class=situlogger.SituRotatingFileHandler 37 class=situlogger.SituRotatingFileHandler
38 level=DEBUG 38 level=DEBUG
39 formatter=SituFormatter 39 formatter=SituFormatter
40 args=('../logs/cronjob.log',) 40 args=('../logs/online_ocr.log',)
41
42 [handler_folderFileHandler]
43 class=situlogger.SituRotatingFileHandler
44 level=DEBUG
45 formatter=SituFormatter
46 args=('../logs/folder_ocr.log',)
41 47
42 [handler_djangodbFileHandler] 48 [handler_djangodbFileHandler]
43 class=situlogger.SituRotatingFileHandler 49 class=situlogger.SituRotatingFileHandler
...@@ -67,6 +73,12 @@ handlers=cronjobFileHandler ...@@ -67,6 +73,12 @@ handlers=cronjobFileHandler
67 qualname=cronjob 73 qualname=cronjob
68 propagate=0 74 propagate=0
69 75
76 [logger_folder]
77 level=INFO
78 handlers=folderFileHandler
79 qualname=folder
80 propagate=0
81
70 [logger_django.db.backends] 82 [logger_django.db.backends]
71 level=DEBUG 83 level=DEBUG
72 handlers=djangodbFileHandler 84 handlers=djangodbFileHandler
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!