CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

functions: logging changes, rotate based on filesize and on startup, print a warning in if log is not created

Browse Source
This commit is contained in:
alfrix 2022-11-01 15:35:49 -03:00
parent 5154e41fed
commit 03e4681aa6
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ks_includes/functions.py
View File

@ -123,8 +123,8 @@ def patch_threading_excepthook():
threading.Thread.__init__ = new_init threading.Thread.__init__ = new_init
# Timed rotating file handler based on Klipper and Moonraker's implementation # Rotating file handler based on Klipper and Moonraker's implementation
class KlipperScreenLoggingHandler(logging.handlers.TimedRotatingFileHandler): class KlipperScreenLoggingHandler(logging.handlers.RotatingFileHandler):
def __init__(self, software_version, filename, **kwargs): def __init__(self, software_version, filename, **kwargs):
super(KlipperScreenLoggingHandler, self).__init__(filename, **kwargs) super(KlipperScreenLoggingHandler, self).__init__(filename, **kwargs)
self.rollover_info = { self.rollover_info = {
@ -158,17 +158,23 @@ def setup_logging(log_file, software_version):
'%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s') '%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
stdout_hdlr.setFormatter(stdout_fmt) stdout_hdlr.setFormatter(stdout_fmt)
fh = None fh = listener = None
if log_file: try:
fh = KlipperScreenLoggingHandler(software_version, log_file, when='midnight', backupCount=2) if os.path.exists(log_file):
formatter = logging.Formatter( os.replace(log_file, log_file + ".1")
'%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s') fh = KlipperScreenLoggingHandler(software_version, log_file, maxBytes=8000000, backupCount=1)
formatter = logging.Formatter('%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
fh.setFormatter(formatter) fh.setFormatter(formatter)
listener = logging.handlers.QueueListener( listener = logging.handlers.QueueListener(queue, fh, stdout_hdlr)
queue, fh, stdout_hdlr) except Exception as e:
else: print(
listener = logging.handlers.QueueListener( f"Unable to create log file at '{os.path.normpath(log_file)}'.\n"
queue, stdout_hdlr) f"Make sure that the folder '{os.path.dirname(log_file)}' exists\n"
f"and KlipperScreen has Read/Write access to the folder.\n"
f"{e}\n"
)
if listener is None:
listener = logging.handlers.QueueListener(queue, stdout_hdlr)
listener.start() listener.start()
def logging_exception_handler(ex_type, value, tb, thread_identifier=None): def logging_exception_handler(ex_type, value, tb, thread_identifier=None):