Unify logger setup logic

This commit is contained in:
huchenlei 2024-08-30 10:16:04 -04:00
parent ba08ca2d2e
commit 21122f9965
3 changed files with 17 additions and 16 deletions

View File

@ -3,19 +3,25 @@ from logging.handlers import MemoryHandler
from collections import deque from collections import deque
logs = None 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(): 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 global logs
if logs: return if logs:
return
# Setup default global logger # Setup default global logger
logger = logging.getLogger() logger = logging.getLogger()
logger.setLevel(logging.INFO) logger.setLevel(logging.DEBUG if verbose else logging.INFO)
logger.addHandler(logging.StreamHandler())
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 # Create a memory handler with a deque as its buffer
logs = deque(maxlen=capacity) logs = deque(maxlen=capacity)

View File

@ -179,10 +179,3 @@ if args.windows_standalone_build:
if args.disable_auto_launch: if args.disable_auto_launch:
args.auto_launch = False 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)

View File

@ -1,14 +1,16 @@
import comfy.options import comfy.options
comfy.options.enable_args_parsing() comfy.options.enable_args_parsing()
from app.logger import setup_logger
setup_logger()
import os import os
import importlib.util import importlib.util
import folder_paths import folder_paths
import time import time
from comfy.cli_args import args from comfy.cli_args import args
from app.logger import setup_logger
setup_logger(verbose=args.verbose)
def execute_prestartup_script(): def execute_prestartup_script():
def execute_script(script_path): def execute_script(script_path):