mirror of
https://github.com/kuhyx/screen-locker.git
synced 2026-11-10 19:07:16 +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
136 lines
5.3 KiB
Bash
Executable File
136 lines
5.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# Install workout locker as a systemd user service
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
SERVICE_FILE="$SCRIPT_DIR/workout-locker.service"
|
|
EARLY_BIRD_TIMER_FILE="$SCRIPT_DIR/early-bird-workout-check.timer"
|
|
LOCKER_TIMER_FILE="$SCRIPT_DIR/workout-locker.timer"
|
|
SYNC_SERVICE_FILE="$SCRIPT_DIR/workout-sync.service"
|
|
SYNC_TIMER_FILE="$SCRIPT_DIR/workout-sync.timer"
|
|
USER_SERVICE_DIR="$HOME/.config/systemd/user"
|
|
SERVICE_NAME="workout-locker.service"
|
|
EARLY_BIRD_TIMER_NAME="early-bird-workout-check.timer"
|
|
LOCKER_TIMER_NAME="workout-locker.timer"
|
|
SYNC_SERVICE_NAME="workout-sync.service"
|
|
SYNC_TIMER_NAME="workout-sync.timer"
|
|
|
|
# Check if service is already installed
|
|
if [ -f "$USER_SERVICE_DIR/$SERVICE_NAME" ]; then
|
|
echo "Screen locker systemd service is already installed."
|
|
echo "Current status:"
|
|
systemctl --user status "$SERVICE_NAME" --no-pager || true
|
|
echo ""
|
|
read -p "Do you want to reinstall/update it? (y/n) " -n 1 -r
|
|
echo
|
|
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
|
echo "Keeping existing installation"
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
# Create user systemd directory if it doesn't exist
|
|
mkdir -p "$USER_SERVICE_DIR"
|
|
|
|
# Remove old timer if it was previously installed
|
|
if systemctl --user is-active "workout-locker.timer" &>/dev/null; then
|
|
systemctl --user disable --now "workout-locker.timer" 2>/dev/null || true
|
|
fi
|
|
rm -f "$USER_SERVICE_DIR/workout-locker.timer"
|
|
|
|
# Seed shutdown_base.json with base=21 if not already present
|
|
SHUTDOWN_BASE="$SCRIPT_DIR/screen_locker/shutdown_base.json"
|
|
if [[ ! -f "$SHUTDOWN_BASE" ]]; then
|
|
printf '{\n "base_mon_wed_hour": 21,\n "base_thu_sun_hour": 21,\n "last_reset_date": ""\n}\n' > "$SHUTDOWN_BASE"
|
|
echo "✓ Created shutdown_base.json with base=21:00"
|
|
fi
|
|
|
|
# Copy service file to user systemd directory
|
|
cp "$SERVICE_FILE" "$USER_SERVICE_DIR/$SERVICE_NAME"
|
|
|
|
# Copy early bird timer
|
|
cp "$EARLY_BIRD_TIMER_FILE" "$USER_SERVICE_DIR/$EARLY_BIRD_TIMER_NAME"
|
|
|
|
# Copy the periodic re-check timer. Without it the locker only ever decides at
|
|
# login and at 08:30/09:05, so a day or ISO-week boundary crossed inside a long
|
|
# session is never re-evaluated.
|
|
cp "$LOCKER_TIMER_FILE" "$USER_SERVICE_DIR/$LOCKER_TIMER_NAME"
|
|
|
|
# Copy the periodic workout-sync units. Without these, syncing happens only
|
|
# once per locker start, so a workout finished after login is not seen until
|
|
# the next login.
|
|
cp "$SYNC_SERVICE_FILE" "$USER_SERVICE_DIR/$SYNC_SERVICE_NAME"
|
|
cp "$SYNC_TIMER_FILE" "$USER_SERVICE_DIR/$SYNC_TIMER_NAME"
|
|
|
|
# Update paths in the service file to use absolute paths
|
|
REPO_ROOT="$SCRIPT_DIR"
|
|
sed -i "s|WorkingDirectory=.*|WorkingDirectory=$REPO_ROOT|" "$USER_SERVICE_DIR/$SERVICE_NAME"
|
|
sed -i "s|Environment=PYTHONPATH=.*|Environment=PYTHONPATH=$REPO_ROOT|" "$USER_SERVICE_DIR/$SERVICE_NAME"
|
|
sed -i "s|ExecStart=/usr/bin/python3.*|ExecStart=/usr/bin/python3 -m screen_locker.screen_lock --production|" "$USER_SERVICE_DIR/$SERVICE_NAME"
|
|
|
|
# Reload systemd daemon
|
|
systemctl --user daemon-reload
|
|
|
|
# Enable the service to start on login (one-shot, no periodic timer)
|
|
systemctl --user enable "$SERVICE_NAME"
|
|
|
|
# Enable the early bird re-check timer
|
|
systemctl --user enable --now "$EARLY_BIRD_TIMER_NAME"
|
|
|
|
# Enable the periodic re-check timer
|
|
systemctl --user enable --now "$LOCKER_TIMER_NAME"
|
|
|
|
# Enable the periodic workout sync
|
|
systemctl --user enable --now "$SYNC_TIMER_NAME"
|
|
|
|
# Verify enforcement is actually armed. enable can silently no-op when systemd
|
|
# breaks an ordering cycle by deleting the timer's job -- exactly what happened
|
|
# on 2026-08-04 -- so a successful `enable` is NOT proof the locker will run.
|
|
if ! python3 "$SCRIPT_DIR/scripts/check_enforcement_armed.py"; then
|
|
echo "✗ Enforcement is NOT armed after install — see the errors above" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "✓ Workout locker service installed"
|
|
echo "✓ Early bird re-check timer installed (fires daily at 08:30)"
|
|
echo "✓ Periodic re-check timer installed (every 30 min)"
|
|
echo "✓ Service will start automatically on next login"
|
|
echo ""
|
|
echo "To start now: systemctl --user start workout-locker"
|
|
echo "To check status: systemctl --user status workout-locker"
|
|
echo "To stop: systemctl --user stop workout-locker"
|
|
echo "To disable autostart: systemctl --user disable workout-locker"
|
|
|
|
# Check autostart installation status
|
|
echo ""
|
|
echo "=== Autostart Status ==="
|
|
if systemctl --user is-enabled "$SERVICE_NAME" &>/dev/null; then
|
|
echo "✓ systemd service: INSTALLED and enabled"
|
|
else
|
|
echo "✗ systemd service: NOT enabled"
|
|
fi
|
|
if systemctl --user is-enabled "$EARLY_BIRD_TIMER_NAME" &>/dev/null; then
|
|
echo "✓ early bird timer: INSTALLED and enabled"
|
|
else
|
|
echo "✗ early bird timer: NOT enabled"
|
|
fi
|
|
if systemctl --user is-enabled "$SYNC_TIMER_NAME" &>/dev/null; then
|
|
echo "✓ workout sync timer: INSTALLED and enabled (every 15 min)"
|
|
else
|
|
echo "✗ workout sync timer: NOT enabled"
|
|
fi
|
|
|
|
I3_CONFIG="$HOME/.config/i3/config"
|
|
if [ -f "$I3_CONFIG" ] && grep -q "exec.*screen_lock.py" "$I3_CONFIG"; then
|
|
echo "✓ i3 autostart: INSTALLED"
|
|
else
|
|
echo " i3 autostart: not installed"
|
|
echo ""
|
|
echo "To add i3 startup hook (recommended), add this line to $I3_CONFIG:"
|
|
echo " exec --no-startup-id /usr/bin/python3 -m screen_locker.screen_lock --production"
|
|
fi
|
|
|
|
# Immediately check if today's workout is done; block if not
|
|
echo ""
|
|
echo "=== Checking today's workout status ==="
|
|
PYTHONPATH="$SCRIPT_DIR" python3 -m screen_locker.screen_lock --production
|