From 03e4681aa6dfe97a3a87aff7fa2e5f2bcae6511c Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Tue, 1 Nov 2022 15:35:49 -0300
Subject: [PATCH] functions: logging changes, rotate based on filesize and on
 startup, print a warning in if log is not created

---
 ks_includes/functions.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/ks_includes/functions.py b/ks_includes/functions.py
index 150fe278..0a7f9ebc 100644
--- a/ks_includes/functions.py
+++ b/ks_includes/functions.py
@@ -123,8 +123,8 @@ def patch_threading_excepthook():
     threading.Thread.__init__ = new_init
 
 
-# Timed rotating file handler based on Klipper and Moonraker's implementation
-class KlipperScreenLoggingHandler(logging.handlers.TimedRotatingFileHandler):
+# Rotating file handler based on Klipper and Moonraker's implementation
+class KlipperScreenLoggingHandler(logging.handlers.RotatingFileHandler):
     def __init__(self, software_version, filename, **kwargs):
         super(KlipperScreenLoggingHandler, self).__init__(filename, **kwargs)
         self.rollover_info = {
@@ -158,17 +158,23 @@ def setup_logging(log_file, software_version):
         '%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
     stdout_hdlr.setFormatter(stdout_fmt)
 
-    fh = None
-    if log_file:
-        fh = KlipperScreenLoggingHandler(software_version, log_file, when='midnight', backupCount=2)
-        formatter = logging.Formatter(
-            '%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
+    fh = listener = None
+    try:
+        if os.path.exists(log_file):
+            os.replace(log_file, log_file + ".1")
+        fh = KlipperScreenLoggingHandler(software_version, log_file, maxBytes=8000000, backupCount=1)
+        formatter = logging.Formatter('%(asctime)s [%(filename)s:%(funcName)s()] - %(message)s')
         fh.setFormatter(formatter)
-        listener = logging.handlers.QueueListener(
-            queue, fh, stdout_hdlr)
-    else:
-        listener = logging.handlers.QueueListener(
-            queue, stdout_hdlr)
+        listener = logging.handlers.QueueListener(queue, fh, stdout_hdlr)
+    except Exception as e:
+        print(
+            f"Unable to create log file at '{os.path.normpath(log_file)}'.\n"
+            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()
 
     def logging_exception_handler(ex_type, value, tb, thread_identifier=None):