lxbfYeaa/BookConverter
Archived
Template
1
0
Fork 0
forked from LiveCarta/BookConverter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite logging in files & stream

Browse Source
This commit is contained in:
Kiryl
2022-03-28 18:39:09 +03:00
parent 1ba54bcf0e
commit 15acd45688
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
consumer.py
View File

@@ -9,10 +9,10 @@ from functools import partial
from threading import Thread, active_count from threading import Thread, active_count
from src.access import Access from src.access import Access
from src.util.helpers import ColoredFormatter
from src.docx_converter.docx_solver import DocxBook from src.docx_converter.docx_solver import DocxBook
from src.epub_converter.epub_solver import EpubBook from src.epub_converter.epub_solver import EpubBook
def configure_file_logger(name, filename='logs/converter.log', filemode='w+', def configure_file_logger(name, filename='logs/converter.log', filemode='w+',
logging_level=logging.INFO): logging_level=logging.INFO):
logger = logging.getLogger(name) logger = logging.getLogger(name)
@@ -22,7 +22,8 @@ def configure_file_logger(name, filename='logs/converter.log', filemode='w+',
file_handler = logging.FileHandler(file_path, mode=filemode) file_handler = logging.FileHandler(file_path, mode=filemode)
logger.addHandler(file_handler) logger.addHandler(file_handler)
file_format = ColoredFormatter('%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]')
file_format = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]')
file_handler.setFormatter(file_format) file_handler.setFormatter(file_format)
logger.setLevel(logging_level) logger.setLevel(logging_level)
return logger return logger

10
src/util/helpers.py
View File

@@ -27,7 +27,7 @@ class ColoredFormatter(logging.Formatter):
class BookLogger: class BookLogger:
def __init__(self, name, book_id, main_logger=None, def __init__(self, name, book_id, main_logger=None,
filemode='w+', logging_level=logging.INFO): filemode='w+', logging_level=logging.INFO, logging_format='%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]'):
""" """
Method for Logger configuration. Logger will write to file. Method for Logger configuration. Logger will write to file.
:param name: name of the Logger. :param name: name of the Logger.
@@ -46,10 +46,13 @@ class BookLogger:
filename = f'logs/{book_id}.log' filename = f'logs/{book_id}.log'
file_path = os.path.join(folder_path, filename) file_path = os.path.join(folder_path, filename)
file_handler = logging.FileHandler(file_path, mode=filemode) file_handler = logging.FileHandler(file_path, mode=filemode)
file_format = ColoredFormatter( file_format = logging.Formatter(logging_format)
'%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]')
file_handler.setFormatter(file_format) file_handler.setFormatter(file_format)
self.logger.addHandler(file_handler) self.logger.addHandler(file_handler)
stream_handler = logging.StreamHandler()
stream_format = ColoredFormatter(logging_format)
stream_handler.setFormatter(stream_format)
self.logger.addHandler(stream_handler)
self.logger.setLevel(logging_level) self.logger.setLevel(logging_level)
def log(self, message, logging_level=20): def log(self, message, logging_level=20):
@@ -77,7 +80,6 @@ class BookStatusWrapper:
self.logger_object = logger_object self.logger_object = logger_object
self.book_id = book_id self.book_id = book_id
def set_status(self, status: str): def set_status(self, status: str):
str_2_status = { str_2_status = {
'[PROCESS]': self.access.PROCESS, '[PROCESS]': self.access.PROCESS,