mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 21:27:13 +01:00
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
Tests / test (3.10) (push) Waiting to run
Tests / test (3.11) (push) Waiting to run
Tests / test (3.12) (push) Waiting to run
Tests / lock-popup-safety (push) Waiting to run
release-apk / release (APK) (push) Waiting to run
The screen locker stopped locking on 2026-08-04 and nobody could tell. Not a
logic bug: every predicate worked the whole time. systemd logged
timers.target: Found ordering cycle: early-bird-workout-check.timer/start
after graphical-session.target/start after basic.target/start after
timers.target/start - after early-bird-workout-check.timer
timers.target: Job early-bird-workout-check.timer/start deleted to break
ordering cycle starting with timers.target/start
and left the timer disabled. A timer that is WantedBy=timers.target must not be
ordered After= a target that itself comes after timers.target; systemd resolves
that loop by deleting the job, which is an absence, and absences page nobody.
That timer is the ONLY thing that closes the early-bird window. Each morning a
run inside the window banked early_bird_pending.json, logged "will re-check at
08:30", and exited 0. The re-check never came, so the marker stood all day,
every day, for thirteen days.
It stayed invisible because logging.basicConfig was called only in the
--sync-only branch, never for --production -- the mode systemd actually runs.
Journal proof: zero INFO lines from workout-locker.service since June. Every
early exit logged at INFO into a logger with no handler. Meanwhile the healthy
15-minute sync kept the system looking alive.
The 2026-08-15 Python split is NOT implicated: it was pure code motion, and
basicConfig already sat in that branch before it.
Fixes:
* Drop the After= that closes the cycle; Persistent=true so a machine asleep at
08:30 still re-checks after resume.
* Add workout-locker.timer (*:00,30). The service is WantedBy=
graphical-session.target, i.e. one decision per login, so the 08-16 -> 08-17
day and ISO-week rollover inside one long session was never re-evaluated.
* arm.sh: install units, enable timers, verify -- one command, because
re-arming was a four-command sequence that was easy to half-do, and
`systemctl enable` returns 0 while systemd deletes the timer job.
* check_enforcement_armed.py asks systemd what it actually scheduled (enabled
AND has a next trigger) and fails loudly otherwise. Wired as ExecStartPost on
workout-sync.service, so a disarmed locker marks that unit failed every 15
minutes instead of scrolling past. install_systemd.sh now fails on it too.
Logging (the reason this went unnoticed, so treated as a defect in its own
right):
* basicConfig for every mode, never one branch.
* Every enforcement-abandoning exit records a decision instead of an invisible
INFO: one greppable line -- DECISION lock=no reason=early_bird_window_active
weekly=0/5 -- at WARNING, since per CLAUDE.md an INFO explanation of a
non-action is a silent failure with extra steps. The enforced case is logged
too: "no line at all" was the outage's whole signature.
* A durable JSONL trail outside the repo (~/.local/share/screen_locker/), so
"when did this last actually enforce?" survives journal rotation. --status
and --sync-only record lock=n/a; "did not decide" must never look like
"decided not to lock".
* check_silent_failures.py now also catches sys.exit(0) that explains nothing.
Verified both directions: it flags 3/3 exits in the pre-fix _auto_upgrade.py
and passes the repo clean.
Sync noise: four records replayed as WARNINGs every cycle (~384/day), which is
how the actionable lines got tuned out. manual_workout:2026-08-15 is an empty
stub ({date, kind, type}) -- no workout to recover, and that day's credit was
already counted under a different sync_record_id, so no credit was ever lost.
The three "collided" records are dedup working. Both now report at info; a
WARNING from this logger again means something real. 4 -> 0 per cycle.
Verified on the live system: the periodic timer fired at 16:45 and the journal
shows `DECISION lock=no reason=scheduled_skip_day weekly=0/5` -- the line that
did not exist for thirteen days. Both timers report enabled and scheduled, and
no ordering cycle recurs. Today is a scheduled skip so the machine was not
locked mid-session; enforcement resumes tomorrow 08:30. 1007 tests, 100%
coverage, all hooks green.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01F2b6ZjBcdrkSYnMujx4mWd
114 lines
3.7 KiB
Python
Executable File
114 lines
3.7 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Add a date to ``scheduled_skips.json`` — the locker's first early exit.
|
|
|
|
A scheduled skip is the supported way to exempt a specific day without
|
|
weakening enforcement for any other day: the lock chain checks it first, and
|
|
(since the 2026-08 logging work) records the exemption as a decision, so an
|
|
unexpected quiet day is traceable to the date that caused it instead of looking
|
|
like the enforcer silently died again.
|
|
|
|
Kept out of ``arm.sh`` because the file it edits is the one the lock chain
|
|
reads: a malformed write is read as "not a skip" and the machine locks anyway,
|
|
so this belongs somewhere the repo's linters and tests actually apply.
|
|
|
|
Usage:
|
|
python3 scripts/add_scheduled_skip.py --date today
|
|
python3 scripts/add_scheduled_skip.py --date 2026-08-20
|
|
python3 scripts/add_scheduled_skip.py --list
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import argparse
|
|
from datetime import datetime, timezone
|
|
import json
|
|
from pathlib import Path
|
|
import sys
|
|
|
|
SKIPS_FILE = (
|
|
Path(__file__).resolve().parent.parent / "screen_locker" / ("scheduled_skips.json")
|
|
)
|
|
|
|
|
|
def _today() -> str:
|
|
"""Return today's local date as YYYY-MM-DD.
|
|
|
|
Local, not UTC: the skip must match the day the user is living in, and the
|
|
lock chain's own ``_today_str`` is local for the same reason.
|
|
"""
|
|
return datetime.now().astimezone().strftime("%Y-%m-%d")
|
|
|
|
|
|
def _report(message: str) -> None:
|
|
"""Write one line to stdout (matches the other scripts in this directory)."""
|
|
sys.stdout.write(f"{message}\n")
|
|
|
|
|
|
def load_skips(path: Path) -> list[str]:
|
|
"""Return the recorded skip dates, or [] when the file is absent."""
|
|
if not path.exists():
|
|
return []
|
|
try:
|
|
data = json.loads(path.read_text(encoding="utf-8"))
|
|
except (OSError, json.JSONDecodeError) as exc:
|
|
# Refuse rather than silently starting a fresh list: overwriting an
|
|
# unreadable file would drop skips the user still expects to hold.
|
|
msg = f"could not read {path}: {exc}"
|
|
msg = f"ERROR: {msg}"
|
|
raise SystemExit(msg) from exc
|
|
if not isinstance(data, list):
|
|
msg = f"ERROR: {path} does not contain a JSON list"
|
|
raise SystemExit(msg)
|
|
return [str(entry) for entry in data]
|
|
|
|
|
|
def add_skip(path: Path, date: str) -> bool:
|
|
"""Add ``date`` to the skips file. True if it was newly added."""
|
|
skips = load_skips(path)
|
|
if date in skips:
|
|
return False
|
|
skips.append(date)
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
path.write_text(json.dumps(sorted(skips), indent=2) + "\n", encoding="utf-8")
|
|
return True
|
|
|
|
|
|
def main(argv: list[str] | None = None) -> int:
|
|
"""Add the requested date, or list what is already recorded."""
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument(
|
|
"--date",
|
|
help="date to skip: 'today' or YYYY-MM-DD",
|
|
)
|
|
parser.add_argument(
|
|
"--list",
|
|
action="store_true",
|
|
help="print the recorded skip dates and exit",
|
|
)
|
|
args = parser.parse_args(argv)
|
|
|
|
if args.list:
|
|
for entry in sorted(load_skips(SKIPS_FILE)):
|
|
_report(entry)
|
|
return 0
|
|
|
|
if not args.date:
|
|
parser.error("--date is required (or use --list)")
|
|
|
|
date = _today() if args.date == "today" else args.date
|
|
try:
|
|
datetime.strptime(date, "%Y-%m-%d").replace(tzinfo=timezone.utc)
|
|
except ValueError:
|
|
msg = f"ERROR: {date!r} is not a YYYY-MM-DD date"
|
|
raise SystemExit(msg) from None
|
|
|
|
if add_skip(SKIPS_FILE, date):
|
|
_report(f"Added scheduled skip for {date} — the locker will not lock that day.")
|
|
else:
|
|
_report(f"{date} is already a scheduled skip; nothing to do.")
|
|
return 0
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|