From c779ac454aaa658346486702da40007bc2754898 Mon Sep 17 00:00:00 2001 From: Jarno Rantanen Date: Mon, 26 Nov 2018 14:37:51 +0200 Subject: [PATCH] Rename BACKUP_UPLOAD_WAIT_SECONDS to BACKUP_WAIT_SECONDS. --- backup.sh | 8 ++++---- entrypoint.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backup.sh b/backup.sh index 164717a..cae45e0 100755 --- a/backup.sh +++ b/backup.sh @@ -38,9 +38,9 @@ if [[ ! "$CONTAINERS_TO_STOP" =~ ^\ *$ ]]; then docker start $CONTAINERS_TO_STOP fi -info "Waiting before upload" -echo "Sleeping $BACKUP_UPLOAD_WAIT_SECONDS seconds..." -sleep "$BACKUP_UPLOAD_WAIT_SECONDS" +info "Waiting before processing" +echo "Sleeping $BACKUP_WAIT_SECONDS seconds..." +sleep "$BACKUP_WAIT_SECONDS" TIME_UPLOAD="0" TIME_UPLOADED="0" @@ -64,7 +64,7 @@ INFLUX_LINE="$INFLUXDB_MEASUREMENT\ ,containers_total=$CONTAINERS_TOTAL\ ,containers_stopped=$CONTAINERS_STOPPED\ ,time_wall=$(perl -E "say $TIME_FINISH - $TIME_START")\ -,time_total=$(perl -E "say $TIME_FINISH - $TIME_START - $BACKUP_UPLOAD_WAIT_SECONDS")\ +,time_total=$(perl -E "say $TIME_FINISH - $TIME_START - $BACKUP_WAIT_SECONDS")\ ,time_compress=$(perl -E "say $TIME_BACKED_UP - $TIME_BACK_UP")\ ,time_upload=$(perl -E "say $TIME_UPLOADED - $TIME_UPLOAD")\ " diff --git a/entrypoint.sh b/entrypoint.sh index 0f3757e..7c44314 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -9,7 +9,7 @@ BACKUP_SOURCES="${BACKUP_SOURCES:-/backup}" BACKUP_CRON_EXPRESSION="${BACKUP_CRON_EXPRESSION:-@daily}" BACKUP_BUCKET_NAME="${BACKUP_BUCKET_NAME:-}" BACKUP_FILENAME="$(date +"${BACKUP_FILENAME:-latest.tar.gz}")" -BACKUP_UPLOAD_WAIT_SECONDS="${BACKUP_UPLOAD_WAIT_SECONDS:-30}" +BACKUP_WAIT_SECONDS="${BACKUP_WAIT_SECONDS:-30}" BACKUP_HOSTNAME="${BACKUP_HOSTNAME:-$(hostname)}" DOCKER_STOP_OPT_IN_LABEL="${DOCKER_STOP_OPT_IN_LABEL:-docker-volume-backup-companion.stop-during-backup}" INFLUXDB_URL="${INFLUXDB_URL:-}"