mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 20: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
117 lines
3.0 KiB
Bash
Executable File
117 lines
3.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# ============================================================================
|
|
# Arm the workout screen locker — install units, enable timers, verify.
|
|
#
|
|
# One command, because re-arming used to be a four-command sequence that was
|
|
# easy to half-do. On 2026-08-04 a systemd ordering cycle silently disabled
|
|
# early-bird-workout-check.timer and enforcement stopped for thirteen days with
|
|
# nothing on the machine saying so; `systemctl enable` alone would NOT have
|
|
# caught that, because enable "succeeds" while systemd deletes the timer job.
|
|
# So this script always finishes by asking systemd what it actually scheduled,
|
|
# and fails loudly when the answer is "nothing".
|
|
#
|
|
# Usage:
|
|
# ./arm.sh # install, enable, verify
|
|
# ./arm.sh --skip-today # ...but do not lock today (adds a scheduled skip)
|
|
# ./arm.sh --status # verify only; change nothing
|
|
# ============================================================================
|
|
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
readonly SCRIPT_DIR
|
|
readonly USER_UNIT_DIR="$HOME/.config/systemd/user"
|
|
|
|
# Units that must be on disk for enforcement to be schedulable.
|
|
readonly UNITS=(
|
|
"workout-locker.service"
|
|
"workout-locker.timer"
|
|
"early-bird-workout-check.timer"
|
|
"workout-sync.service"
|
|
"workout-sync.timer"
|
|
)
|
|
|
|
# Only the timers get enabled; the service is triggered by them and by login.
|
|
readonly TIMERS=(
|
|
"early-bird-workout-check.timer"
|
|
"workout-locker.timer"
|
|
"workout-sync.timer"
|
|
)
|
|
|
|
SKIP_TODAY=0
|
|
STATUS_ONLY=0
|
|
|
|
usage() {
|
|
echo "Usage: $(basename "$0") [--skip-today] [--status]"
|
|
echo " --skip-today Arm the locker but exempt today (no lock until tomorrow)"
|
|
echo " --status Report whether enforcement is armed; change nothing"
|
|
exit 0
|
|
}
|
|
|
|
verify_armed() {
|
|
python3 "$SCRIPT_DIR/scripts/check_enforcement_armed.py"
|
|
}
|
|
|
|
add_skip_for_today() {
|
|
# Delegated to Python rather than hand-editing JSON in bash: the file is
|
|
# the same one the lock chain reads, and a malformed write would be read as
|
|
# "not a skip" and lock anyway.
|
|
python3 "$SCRIPT_DIR/scripts/add_scheduled_skip.py" --date today
|
|
}
|
|
|
|
main() {
|
|
if ((STATUS_ONLY)); then
|
|
verify_armed
|
|
return
|
|
fi
|
|
|
|
echo "Installing units into $USER_UNIT_DIR"
|
|
mkdir -p "$USER_UNIT_DIR"
|
|
for unit in "${UNITS[@]}"; do
|
|
cp "$SCRIPT_DIR/$unit" "$USER_UNIT_DIR/$unit"
|
|
done
|
|
|
|
systemctl --user daemon-reload
|
|
|
|
if ((SKIP_TODAY)); then
|
|
# Register the exemption BEFORE the timers can fire, so arming can
|
|
# never race the first re-check and lock the machine anyway.
|
|
add_skip_for_today
|
|
fi
|
|
|
|
echo "Enabling timers"
|
|
systemctl --user enable --now "${TIMERS[@]}"
|
|
|
|
# The whole point: `enable` returning 0 is not proof of anything.
|
|
echo ""
|
|
verify_armed
|
|
echo ""
|
|
echo "✓ Screen locker armed."
|
|
if ((SKIP_TODAY)); then
|
|
echo " Today is exempt — enforcement begins tomorrow."
|
|
fi
|
|
}
|
|
|
|
while [[ $# -gt 0 ]]; do
|
|
case $1 in
|
|
--skip-today)
|
|
SKIP_TODAY=1
|
|
shift
|
|
;;
|
|
--status)
|
|
STATUS_ONLY=1
|
|
shift
|
|
;;
|
|
-h | --help)
|
|
usage
|
|
;;
|
|
*)
|
|
echo "Unknown option: $1" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
main "$@"
|