c3ce6d447a
The Server Log panel showed the last 200 lines of the unit's entire journal — mixing the current run with leftovers from prior starts. Resolve the unit's InactiveExitTimestamp inside the journalctl helper and pass it as journalctl --since so the panel begins at the latest unit start. Never-run units fall back to the legacy unit-only filter so -f attaches on first start. No Python changes; the helper's argv shape and sudoers grant stay identical. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
75 lines
1.9 KiB
Bash
Executable file
75 lines
1.9 KiB
Bash
Executable file
#!/bin/sh
|
|
set -eu
|
|
|
|
usage() {
|
|
printf '%s\n' "usage: left4me-journalctl <server-name> --lines <n> --follow|--no-follow" >&2
|
|
exit 2
|
|
}
|
|
|
|
validate_name() {
|
|
name=$1
|
|
[ -n "$name" ] || usage
|
|
case "$name" in
|
|
.*|*..*|*/*|*\\*) usage ;;
|
|
esac
|
|
case "$name" in
|
|
*[!A-Za-z0-9_.-]*) usage ;;
|
|
esac
|
|
}
|
|
|
|
[ "$#" -eq 4 ] || usage
|
|
name=$1
|
|
lines_flag=$2
|
|
lines=$3
|
|
follow_flag=$4
|
|
|
|
validate_name "$name"
|
|
[ "$lines_flag" = "--lines" ] || usage
|
|
case "$lines" in
|
|
''|*[!0-9]*) usage ;;
|
|
esac
|
|
|
|
follow_arg=
|
|
case "$follow_flag" in
|
|
--follow) follow_arg=-f ;;
|
|
--no-follow) ;;
|
|
*) usage ;;
|
|
esac
|
|
|
|
unit="left4me-server@${name}.service"
|
|
|
|
if [ -x /bin/systemctl ]; then
|
|
systemctl=/bin/systemctl
|
|
elif [ -x /usr/bin/systemctl ]; then
|
|
systemctl=/usr/bin/systemctl
|
|
else
|
|
printf '%s\n' 'systemctl not found at /bin/systemctl or /usr/bin/systemctl' >&2
|
|
exit 69
|
|
fi
|
|
|
|
if [ -x /bin/journalctl ]; then
|
|
journalctl=/bin/journalctl
|
|
elif [ -x /usr/bin/journalctl ]; then
|
|
journalctl=/usr/bin/journalctl
|
|
else
|
|
printf '%s\n' 'journalctl not found at /bin/journalctl or /usr/bin/journalctl' >&2
|
|
exit 69
|
|
fi
|
|
|
|
# Anchor `--since` to the moment systemd began the unit's current start
|
|
# transaction so the log panel starts at the latest run. Force LC_ALL=C so
|
|
# the day-of-week prefix is in a locale journalctl reliably parses.
|
|
start_time=$(LC_ALL=C "$systemctl" show -p InactiveExitTimestamp --value "$unit" 2>/dev/null || true)
|
|
|
|
if [ -n "$start_time" ]; then
|
|
if [ -n "$follow_arg" ]; then
|
|
exec "$journalctl" -u "$unit" --since "$start_time" -n "$lines" -o cat "$follow_arg"
|
|
fi
|
|
exec "$journalctl" -u "$unit" --since "$start_time" -n "$lines" -o cat
|
|
fi
|
|
|
|
# Unit has never run: no --since cutoff. `-f` will attach on first start.
|
|
if [ -n "$follow_arg" ]; then
|
|
exec "$journalctl" -u "$unit" -n "$lines" -o cat "$follow_arg"
|
|
fi
|
|
exec "$journalctl" -u "$unit" -n "$lines" -o cat
|