update: mark as backuped
This commit is contained in:
parent
4352135bdb
commit
91645a788b
1 changed files with 21 additions and 13 deletions
|
|
@ -236,16 +236,20 @@ mark_user_activity_backuped() {
|
||||||
local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE"
|
local activity_file="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE"
|
||||||
local marker="[backuped:${BACKUP_SIGNATURE}]"
|
local marker="[backuped:${BACKUP_SIGNATURE}]"
|
||||||
|
|
||||||
[[ -z "${ACTIVITY_LINE_CUTOFF:-}" || "$ACTIVITY_LINE_CUTOFF" -le 0 ]] && return 0
|
[[ "$ACTIVITY_LINE_CUTOFF" -le 0 ]] && return 0
|
||||||
|
|
||||||
# Only mark lines that existed before the backup started
|
local tmp
|
||||||
sed -i \
|
tmp="$(mktemp)"
|
||||||
-e "1,${ACTIVITY_LINE_CUTOFF}{
|
|
||||||
/was logged in/{
|
awk -v cutoff="$ACTIVITY_LINE_CUTOFF" -v marker="$marker" '
|
||||||
/$marker/! s/\$/ $marker/
|
NR <= cutoff && /was logged in/ && index($0, marker) == 0 {
|
||||||
}
|
print $0 " " marker
|
||||||
}" \
|
next
|
||||||
"$activity_file"
|
}
|
||||||
|
{ print }
|
||||||
|
' "$activity_file" > "$tmp"
|
||||||
|
|
||||||
|
mv "$tmp" "$activity_file"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -408,10 +412,6 @@ BACKUP_SIGNATURE="$(build_backup_signature)"
|
||||||
|
|
||||||
ACTIVITY_LINE_CUTOFF=0
|
ACTIVITY_LINE_CUTOFF=0
|
||||||
|
|
||||||
if [[ "$CHECK_USER" == true ]]; then
|
|
||||||
ACTIVITY_LINE_CUTOFF=$(wc -l < "$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE")
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
if [[ "$CHECK_USER" == true ]]; then
|
if [[ "$CHECK_USER" == true ]]; then
|
||||||
echo "[INFO] Running in --check-user mode"
|
echo "[INFO] Running in --check-user mode"
|
||||||
|
|
@ -422,6 +422,14 @@ if [[ "$CHECK_USER" == true ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [[ "$CHECK_USER" == true ]]; then
|
||||||
|
ACTIVITY_FILE="$DATA_DIR/$SERVER_NAME/$USER_ACTIVITY_FILE"
|
||||||
|
ACTIVITY_LINE_CUTOFF=$(wc -l < "$ACTIVITY_FILE")
|
||||||
|
echo "[DEBUG] Activity cutoff set to line $ACTIVITY_LINE_CUTOFF"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [[ "$FULL" == true ]]; then
|
if [[ "$FULL" == true ]]; then
|
||||||
BACKUP_SOURCE="${SERVER_NAME}"
|
BACKUP_SOURCE="${SERVER_NAME}"
|
||||||
BACKUP_MODE="full server directory"
|
BACKUP_MODE="full server directory"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue