diff --git a/app/logger.py b/app/logger.py index a1287c999..17662c9e7 100644 --- a/app/logger.py +++ b/app/logger.py @@ -3,19 +3,25 @@ from logging.handlers import MemoryHandler from collections import deque logs = None -formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s') +formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") + def get_logs(): - return '\n'.join([formatter.format(x) for x in logs]) + return "\n".join([formatter.format(x) for x in logs]) -def setup_logger(capacity=300): + +def setup_logger(verbose: bool = False, capacity: int = 300): global logs - if logs: return + if logs: + return # Setup default global logger logger = logging.getLogger() - logger.setLevel(logging.INFO) - logger.addHandler(logging.StreamHandler()) + logger.setLevel(logging.DEBUG if verbose else logging.INFO) + + stream_handler = logging.StreamHandler() + stream_handler.setFormatter(logging.Formatter("%(message)s")) + logger.addHandler(stream_handler) # Create a memory handler with a deque as its buffer logs = deque(maxlen=capacity) diff --git a/comfy/cli_args.py b/comfy/cli_args.py index c98d4dfaf..3a0a26d07 100644 --- a/comfy/cli_args.py +++ b/comfy/cli_args.py @@ -179,10 +179,3 @@ if args.windows_standalone_build: if args.disable_auto_launch: args.auto_launch = False - -import logging -logging_level = logging.INFO -if args.verbose: - logging_level = logging.DEBUG - -logging.basicConfig(format="%(message)s", level=logging_level) diff --git a/main.py b/main.py index c75c0e75e..3db28e1fd 100644 --- a/main.py +++ b/main.py @@ -1,14 +1,16 @@ import comfy.options comfy.options.enable_args_parsing() -from app.logger import setup_logger -setup_logger() - import os import importlib.util import folder_paths import time from comfy.cli_args import args +from app.logger import setup_logger + + +setup_logger(verbose=args.verbose) + def execute_prestartup_script(): def execute_script(script_path):