Merge pull request #149 from Integration-Automation/dev

Dev

Author: JE-Chen

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor_dev"
-version = "0.0.201"
+version = "0.0.203"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

je_editor/pyside_ui/main_ui/main_editor.py

@@ -12,6 +12,7 @@
 from frontengine import RedirectManager
 from qt_material import QtStyleTools
 
+from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.auto_save.auto_save_manager import init_new_auto_save_thread, file_is_open_manager_dict
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
@@ -22,7 +23,6 @@
     write_user_setting
 from je_editor.pyside_ui.main_ui.system_tray.extend_system_tray import ExtendSystemTray
 from je_editor.utils.file.open.open_file import read_file
-from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 from je_editor.utils.redirect_manager.redirect_manager_class import redirect_manager_instance
 
@@ -97,7 +97,7 @@ def __init__(self, debug_mode: bool = False, show_system_tray_ray: bool = False)
                 self.system_tray.show()
                 self.system_tray.setToolTip(language_wrapper.language_word_dict.get("application_name"))
         # Put Redirect on last to trace exception
-        RedirectManager.restore_std()
+        redirect_manager_instance.restore_std()
         redirect_manager_instance.set_redirect()
         # Timer to redirect error or message
         self.redirect_timer = QTimer(self)
@@ -204,7 +204,7 @@ def go_to_new_tab(self, file_path: Path):
             self.tab_widget.setCurrentWidget(widget)
 
     def closeEvent(self, event) -> None:
-        jeditor_logger.info(f"EditorMain closeEvent")
+        jeditor_logger.info("EditorMain closeEvent")
         write_user_setting()
         write_user_color_setting()
         super().closeEvent(event)

je_editor/utils/logging/loggin_instance.py

@@ -5,9 +5,23 @@
 jeditor_logger = logging.getLogger("JEditor")
 formatter = logging.Formatter('%(asctime)s | %(name)s | %(levelname)s | %(message)s')
 
-# Rotating File Handler
-rotating_file_handler = RotatingFileHandler(filename="JEditor.log", mode="w",maxBytes=1073741824)
-rotating_file_handler.setFormatter(formatter)
-jeditor_logger.addHandler(rotating_file_handler)
+
+class JEditorLoggingHandler(RotatingFileHandler):
+
+    # redirect logging stderr output to queue
+
+    def __init__(self, filename: str = "JEditor.log", mode="w",
+                 maxBytes:int=1073741824, backupCount:int=0):
+        super().__init__(filename=filename, mode=mode, maxBytes=maxBytes, backupCount=backupCount)
+        self.formatter = formatter
+        self.setLevel(logging.DEBUG)
+
+    def emit(self, record: logging.LogRecord) -> None:
+        super().emit(record)
+
+
+# File handler
+file_handler = JEditorLoggingHandler()
+jeditor_logger.addHandler(file_handler)
 
 

je_editor/utils/redirect_manager/redirect_manager_class.py

@@ -10,15 +10,12 @@ class RedirectStdOut(logging.Handler):
     # redirect logging std output to queue
 
     def __init__(self):
-        jeditor_logger.info("Init RedirectStdOut")
         super().__init__()
 
     def write(self, content_to_write) -> None:
-        jeditor_logger.info(f"RedirectStdOut write content_to_write: {content_to_write}")
         redirect_manager_instance.std_out_queue.put(content_to_write)
 
     def emit(self, record: logging.LogRecord) -> None:
-        jeditor_logger.info(f"RedirectStdOut emit record: {record}")
         redirect_manager_instance.std_out_queue.put(self.format(record))
 
 
@@ -27,15 +24,12 @@ class RedirectStdErr(logging.Handler):
     # redirect logging stderr output to queue
 
     def __init__(self):
-        jeditor_logger.info("Init RedirectStdErr")
         super().__init__()
 
     def write(self, content_to_write) -> None:
-        jeditor_logger.info(f"RedirectStdErr write content_to_write: {content_to_write}")
         redirect_manager_instance.std_err_queue.put(content_to_write)
 
     def emit(self, record: logging.LogRecord) -> None:
-        jeditor_logger.info(f"RedirectStdErr emit record: {record}")
         redirect_manager_instance.std_err_queue.put(self.format(record))
 
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor"
-version = "0.0.184"
+version = "0.0.186"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]