diff --git a/consumer.py b/consumer.py index b40c862..9aff9f0 100644 --- a/consumer.py +++ b/consumer.py @@ -9,10 +9,10 @@ from functools import partial from threading import Thread, active_count from src.access import Access -from src.util.helpers import ColoredFormatter from src.docx_converter.docx_solver import DocxBook from src.epub_converter.epub_solver import EpubBook + def configure_file_logger(name, filename='logs/converter.log', filemode='w+', logging_level=logging.INFO): 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) 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) logger.setLevel(logging_level) return logger diff --git a/src/util/helpers.py b/src/util/helpers.py index 13b2099..e158c89 100644 --- a/src/util/helpers.py +++ b/src/util/helpers.py @@ -27,7 +27,7 @@ class ColoredFormatter(logging.Formatter): class BookLogger: 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. :param name: name of the Logger. @@ -46,10 +46,13 @@ class BookLogger: filename = f'logs/{book_id}.log' file_path = os.path.join(folder_path, filename) file_handler = logging.FileHandler(file_path, mode=filemode) - file_format = ColoredFormatter( - '%(asctime)s - %(levelname)s - %(message)s [%(filename)s:%(lineno)d in %(funcName)s]') + file_format = logging.Formatter(logging_format) file_handler.setFormatter(file_format) 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) def log(self, message, logging_level=20): @@ -77,7 +80,6 @@ class BookStatusWrapper: self.logger_object = logger_object self.book_id = book_id - def set_status(self, status: str): str_2_status = { '[PROCESS]': self.access.PROCESS,