Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions UXTU4Linux/Assets/Modules/daemon.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ def __init__(self) -> None:
self._interval = 3
self._last_output = ""
self._running_loop = False
self._last_logged_mode = ""
with self._lock:
self._last_logged_mode = ""

self._dispatch = {
"ping": self._cmd_ping,
Expand Down Expand Up @@ -249,7 +250,6 @@ def _loop_body(self, args: str, mode: str, interval: int, dynamic: bool) -> None
self._stop_evt.wait(min(remaining, max_wait_step))
if self._stop_evt.is_set():
break
eff_mode = mode
try:
eff_mode, eff_args = self._effective_mode_args(mode, args, dynamic)
with self._lock:
Expand All @@ -259,7 +259,8 @@ def _loop_body(self, args: str, mode: str, interval: int, dynamic: bool) -> None
with self._lock:
self._last_logged_mode = eff_mode
except Exception as exc:
logging.warning("Failed to apply preset '%s' in loop: %s", eff_mode, exc)
failed_mode = locals().get("eff_mode", mode)
logging.warning("Failed to apply preset '%s' in loop: %s", failed_mode, exc)
with self._lock:
self._running_loop = False

Expand Down Expand Up @@ -316,7 +317,8 @@ def _cmd_apply_loop(self, msg: dict) -> dict:
try:
eff_mode, eff_args = self._effective_mode_args(mode, args, dynamic)
self._apply_once(eff_args, eff_mode, log=True)
self._last_logged_mode = eff_mode
with self._lock:
self._last_logged_mode = eff_mode
except Exception as exc:
with self._lock:
self._running_loop = False
Expand Down Expand Up @@ -433,8 +435,8 @@ def run(self) -> None:
# while avoiding a tight loop that would wake the CPU too frequently.
poll_timeout_ms = ZMQ_POLL_TIMEOUT_MS

signal.signal(signal.SIGTERM, lambda *args: self._sig_handler(stop_requested, *args))
signal.signal(signal.SIGINT, lambda *args: self._sig_handler(stop_requested, *args))
signal.signal(signal.SIGTERM, lambda signum, frame: self._sig_handler(stop_requested, signum, frame))
signal.signal(signal.SIGINT, lambda signum, frame: self._sig_handler(stop_requested, signum, frame))

while True:
if stop_requested.is_set():
Expand Down
Loading