version bump

.gitignore

@@ -0,0 +1 @@
+.vscode/

btrbk-cron

@@ -5,6 +5,12 @@ LOCKFILE=/run/btrbk/btrbk.lock
 LOGFILE=$(mktemp)
 trap 'rm -f -- "${LOGFILE}"' EXIT
 
+# check for superpowers
+if [[ "${EUID}" -ne 0 ]] ; then
+  echo "Please run me as root"
+  exit 1
+fi
+
 echo "---" | tee -a "${LOGFILE}"
 echo "Start btrbk-cron: $(date||true)" | tee -a "${LOGFILE}"
 
@@ -18,6 +24,7 @@ fi
 HEALTHCHECK_URL=${HEALTHCHECK_URL:-http://127.0.0.1}
 HEALTHCHECK_ENABLE=${HEALTHCHECK_ENABLE:-false}
 FAIL_IF_TARGET_UNREACHABLE=${FAIL_IF_TARGET_UNREACHABLE:-true}
+IGNORE_TARGET_UNREACHABLE=${IGNORE_TARGET_UNREACHABLE:-false}
 CURLOPTS=(-fsS -m 10 --retry 5)
 
 if [[ ! -d /run/btrbk ]] ; then
@@ -31,13 +38,21 @@ else
   echo "Info: Healthchecks disabled"
 fi
 
+# lockfile check
 if [[ -f "${LOCKFILE}" ]] ; then
-  echo "Another instance is still running" | tee -a "${LOGFILE}"
+  # check if stale lockfile
-  if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then
+  if [[ $(pgrep --exact --count btrbk || true) -eq 0 ]] ; then
-    curl "${CURLOPTS[@]}" --data-binary "@${LOGFILE}" "${HEALTHCHECK_URL}/log"
+    echo "Removing stale lock file: ${LOCKFILE}"
+    rm "${LOCKFILE}"
+  else
+    # another instance is really running, we exit
+    echo "Another instance is still running" | tee -a "${LOGFILE}"
+    if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then
+      curl "${CURLOPTS[@]}" --data-binary "@${LOGFILE}" "${HEALTHCHECK_URL}/log"
+    fi
+    rm -f -- "${LOGFILE}"
+    exit 0
   fi
-  rm -f -- "${LOGFILE}"
-  exit 0
 fi
 
 HOST=$(grep -E '^[\ \t]*target[\ \t]+send-receive' /etc/btrbk/btrbk.conf)
@@ -52,16 +67,18 @@ SSHUSER=$(echo "${SSHUSER}" | sed -r 's/.*ssh_user[\ \t]+//g')
 
 SSH_OK=$(ssh -i "${IDENTITYFILE}" "${SSHUSER}@${HOST}" "which btrfs")
 
-if [[ "${SSH_OK}" = "" ]] ; then
+if [[ "${IGNORE_TARGET_UNREACHABLE}" = "false" ]] ; then
-  echo "Warning: exiting because of backup destination unreachable" | tee -a "${LOGFILE}"
+  if [[ "${SSH_OK}" = "" ]] ; then
-  if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then
+    echo "Warning: exiting because of backup destination unreachable" | tee -a "${LOGFILE}"
-    curl "${CURLOPTS[@]}" --data-binary "@${LOGFILE}" "${HEALTHCHECK_URL}/log"
+    if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then
-  fi
+      curl "${CURLOPTS[@]}" --data-binary "@${LOGFILE}" "${HEALTHCHECK_URL}/log"
-  rm -f -- "${LOGFILE}"
+    fi
-  if [[ "${FAIL_IF_TARGET_UNREACHABLE}" = "true" ]] ; then
+    rm -f -- "${LOGFILE}"
-    exit 1
+    if [[ "${FAIL_IF_TARGET_UNREACHABLE}" = "true" ]] ; then
-  else
+      exit 1
-    exit 0
+    else
+      exit 0
+    fi
   fi
 fi
 
@@ -71,7 +88,7 @@ if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then
 fi
 echo
 echo "healthcheck notified! (start)" | tee -a "${LOGFILE}"
-(nice -n 19 /usr/bin/ionice -c idle /usr/bin/btrbk -v --progress run >> "${LOGFILE}" ; ) 2>&1 
+(nice -n 19 /usr/bin/ionice -c idle /usr/bin/btrbk -v --progress run 2>&1 || true) | tee -a "${LOGFILE}" 2>&1
 ret=$?
 if [[ "${ret}" -eq "0" ]]; then
   if [[ "${HEALTHCHECK_ENABLE}" = "true" ]] ; then

btrbk-cron.conf.example

@@ -1,3 +1,4 @@
 HEALTHCHECK_ENABLE=true
 HEALTHCHECK_URL=https://my.selfhosted.healthcheck.com/ping/e48e4add-c17c-467c-9a91-7b245ad57fe8
 FAIL_IF_TARGET_UNREACHABLE=true
+IGNORE_TARGET_UNREACHABLE=false

debian/changelog

@@ -1,3 +1,28 @@
+btrbk-cron (0.4.3) stable; urgency=medium
+
+  * added flag IGNORE_TARGET_UNREACHABLE
+
+ -- Paolo Asperti <paolo@asperti.com>  Sat, 01 Feb 2025 14:06:08 +0100
+
+btrbk-cron (0.4.2) stable; urgency=medium
+
+  * gather all logs
+
+ -- Paolo Asperti <paolo@asperti.com>  Tue, 22 Oct 2024 11:21:43 +0200
+
+btrbk-cron (0.4.1) stable; urgency=medium
+
+  * fix error redir
+
+ -- Paolo Asperti <paolo@asperti.com>  Wed, 16 Oct 2024 11:56:39 +0200
+
+btrbk-cron (0.4) stable; urgency=medium
+
+  * stale lockfile check
+  * require to run as root
+
+ -- Paolo Asperti <paolo@asperti.com>  Tue, 15 Oct 2024 09:23:11 +0200
+
 btrbk-cron (0.3) stable; urgency=medium
 
   * clean exit if lockfile present