From 7adafa453d3611cc54dee2234eb00cbba3b73e29 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Sat, 6 Jul 2024 21:35:58 +0900 Subject: [PATCH] fix: logging hook - robust patch fix: potential crash - extracting port info --- glob/manager_core.py | 2 +- prestartup_script.py | 10 +++++++--- pyproject.toml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/glob/manager_core.py b/glob/manager_core.py index a41a3ec4..fc08795a 100644 --- a/glob/manager_core.py +++ b/glob/manager_core.py @@ -23,7 +23,7 @@ sys.path.append(glob_path) import cm_global from manager_util import * -version = [2, 44, 2] +version = [2, 44, 3] version_str = f"V{version[0]}.{version[1]}" + (f'.{version[2]}' if len(version) > 2 else '') diff --git a/prestartup_script.py b/prestartup_script.py index d5514d57..163a9880 100644 --- a/prestartup_script.py +++ b/prestartup_script.py @@ -165,6 +165,8 @@ try: if port_index + 1 < len(sys.argv): port = int(sys.argv[port_index + 1]) postfix = f"_{port}" + else: + postfix = "" else: postfix = "" @@ -301,11 +303,13 @@ try: if enable_file_logging: sys.stdout = ComfyUIManagerLogger(True) - sys.stderr = ComfyUIManagerLogger(False) + stderr_wrapper = ComfyUIManagerLogger(False) + sys.stderr = stderr_wrapper atexit.register(close_log) else: sys.stdout.close_log = lambda: None + stderr_wrapper = None class LoggingHandler(logging.Handler): @@ -322,8 +326,8 @@ try: if 'Starting server' in message: is_start_mode = False - if enable_file_logging: - sys.stderr.sync_write(message+'\n', file_only=True) + if stderr_wrapper: + stderr_wrapper.sync_write(message+'\n', file_only=True) logging.getLogger().addHandler(LoggingHandler()) diff --git a/pyproject.toml b/pyproject.toml index 4913c850..a80af338 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui-manager" description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI." -version = "2.44.2" +version = "2.44.3" license = "LICENSE" dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]