diff --git a/ui/settings.py b/ui/settings.py index e325453..3103278 100644 --- a/ui/settings.py +++ b/ui/settings.py @@ -9,8 +9,8 @@ from typing import Union from proxy import coerce_domain_list, parse_dc_ip_list from ui.i18n import t -UI_ONLY_KEYS = frozenset({ - "appearance", "autostart", "check_updates", "language" +LIVE_SETTINGS_KEYS = frozenset({ + "appearance", "autostart", "check_updates", "language", "verbose" }) @@ -21,7 +21,7 @@ class SettingsChange: @property def requires_restart(self) -> bool: - return bool(self.changed_keys - UI_ONLY_KEYS) + return bool(self.changed_keys - LIVE_SETTINGS_KEYS) def prepare_settings(current: dict, values: dict, defaults: dict) -> SettingsChange: diff --git a/ui/settings_dialog.py b/ui/settings_dialog.py index a75ac81..75c12dc 100644 --- a/ui/settings_dialog.py +++ b/ui/settings_dialog.py @@ -9,6 +9,7 @@ from tkinter import messagebox from ui.settings_form import validate_config_form from ui.i18n import set_language, t from ui.settings import prepare_settings +from utils.logging_setup import set_verbose_logging log = logging.getLogger("tg-ws-tray") @@ -71,6 +72,8 @@ class SettingsDialog: messagebox.showerror(t("app.error_title"), str(exc), parent=self.root) return self.config.update(deepcopy(change.config)) + if "verbose" in change.changed_keys: + set_verbose_logging(change.config["verbose"]) set_language(change.config["language"]) changed_keys = change.changed_keys | ({"autostart"} if autostart_changed else set()) log.info("Settings saved: %s", ", ".join(sorted(changed_keys))) diff --git a/utils/logging_setup.py b/utils/logging_setup.py index 38e2c18..be24c18 100644 --- a/utils/logging_setup.py +++ b/utils/logging_setup.py @@ -1,4 +1,4 @@ -"""Shared construction and formatting of the rotating log file handler. +"""Shared logging setup for the tray and CLI. Centralizes the rotation invariant so both the tray and the CLI log paths behave identically and the file can never grow without bound (issue #885). @@ -18,6 +18,10 @@ _MIN_BYTES = 32 * 1024 _MIN_BACKUPS = 1 +def set_verbose_logging(verbose: bool) -> None: + logging.getLogger().setLevel(logging.DEBUG if verbose else logging.INFO) + + def build_log_handler( path: str, log_max_mb: float = 5, diff --git a/utils/tray_common.py b/utils/tray_common.py index 93386fd..089d0ee 100644 --- a/utils/tray_common.py +++ b/utils/tray_common.py @@ -20,7 +20,7 @@ from proxy.utils import DomainCensorFilter from proxy.tg_ws_proxy import _run from utils.default_config import default_tray_config from utils.diagnostics import diagnose_listen_error -from utils.logging_setup import build_log_handler +from utils.logging_setup import build_log_handler, set_verbose_logging log = logging.getLogger("tg-ws-tray") @@ -230,9 +230,8 @@ _LOG_FMT_CONSOLE = "%(asctime)s %(levelname)-5s %(message)s" def setup_logging(verbose: bool = False, log_max_mb: float = 5) -> None: ensure_dirs() - level = logging.DEBUG if verbose else logging.INFO + set_verbose_logging(verbose) root = logging.getLogger() - root.setLevel(level) logging.getLogger('asyncio').setLevel(logging.WARNING) fh = build_log_handler(str(LOG_FILE), log_max_mb=log_max_mb, backups=1) @@ -242,7 +241,7 @@ def setup_logging(verbose: bool = False, log_max_mb: float = 5) -> None: if not IS_FROZEN: ch = logging.StreamHandler(sys.stdout) - ch.setLevel(level) + ch.setLevel(logging.DEBUG) ch.setFormatter(logging.Formatter(_LOG_FMT_CONSOLE, datefmt="%H:%M:%S")) ch.addFilter(DomainCensorFilter()) root.addHandler(ch)