diff --git a/cli/hf-convert.py b/cli/hf-convert.py index 02599bf3e..eeefdce5e 100755 --- a/cli/hf-convert.py +++ b/cli/hf-convert.py @@ -8,7 +8,7 @@ import diffusers import safetensors import safetensors.torch as sf -log = logging.getLogger("sdnext") +log = logging.getLogger("sd") logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s | %(message)s') diff --git a/installer.py b/installer.py index d7b1d1cef..7529f6cea 100644 --- a/installer.py +++ b/installer.py @@ -103,12 +103,6 @@ def setup_logging(): fh.doRollover() log_rolled = True - global first_call # pylint: disable=global-statement - if first_call: - log_size = os.path.getsize(log_file) if os.path.exists(log_file) else 0 - log.debug(f'Logger: file={log_file} level={level} size={log_size} mode={"append" if not log_rolled else "create"}') - first_call = False - fh.formatter = logging.Formatter('%(asctime)s | %(name)s | %(levelname)s | %(module)s | %(message)s') fh.setLevel(logging.DEBUG) log.addHandler(fh) @@ -121,10 +115,17 @@ def setup_logging(): # overrides logging.getLogger("urllib3").setLevel(logging.ERROR) logging.getLogger("httpx").setLevel(logging.ERROR) + logging.getLogger("diffusers").setLevel(logging.ERROR) + logging.getLogger("torch").setLevel(logging.ERROR) logging.getLogger("ControlNet").handlers = log.handlers logging.getLogger("lycoris").handlers = log.handlers # logging.getLogger("DeepSpeed").handlers = log.handlers +def get_logfile(): + log_size = os.path.getsize(log_file) if os.path.exists(log_file) else 0 + log.info(f'Logger: file="{log_file}" level={logging.getLevelName(logging.DEBUG if args.debug else logging.INFO)} size={log_size} mode={"append" if not log_rolled else "create"}') + return log_file + def custom_excepthook(exc_type, exc_value, exc_traceback): import traceback diff --git a/launch.py b/launch.py index f47876240..43707818a 100755 --- a/launch.py +++ b/launch.py @@ -171,6 +171,7 @@ if __name__ == "__main__": installer.args = args installer.setup_logging() installer.log.info('Starting SD.Next') + installer.get_logfile() try: sys.excepthook = installer.custom_excepthook except Exception: @@ -218,9 +219,6 @@ if __name__ == "__main__": installer.log.warning(f'See log file for more details: {installer.log_file}') installer.extensions_preload(parser) # adds additional args from extensions args = installer.parse_args(parser) - # installer.run_setup() - # installer.log.debug(f"Args: {vars(args)}") - logging.disable(logging.NOTSET if args.debug else logging.DEBUG) uv, instance = start_server(immediate=True, server=None) while True: diff --git a/webui.py b/webui.py index 46e3d7156..157731f10 100644 --- a/webui.py +++ b/webui.py @@ -47,8 +47,6 @@ state = shared.state backend = shared.backend if not modules.loader.initialized: timer.startup.record("libraries") - log.setLevel(logging.DEBUG if cmd_opts.debug else logging.INFO) - logging.disable(logging.NOTSET if cmd_opts.debug else logging.DEBUG) if cmd_opts.server_name: server_name = cmd_opts.server_name else: @@ -212,7 +210,6 @@ def async_policy(): def start_common(): log.debug('Entering start sequence') - logging.disable(logging.NOTSET if cmd_opts.debug else logging.DEBUG) if shared.cmd_opts.data_dir is not None and len(shared.cmd_opts.data_dir) > 0: log.info(f'Using data path: {shared.cmd_opts.data_dir}') if shared.cmd_opts.models_dir is not None and len(shared.cmd_opts.models_dir) > 0 and shared.cmd_opts.models_dir != 'models':