diff --git a/pica-db-backup/mongo-run.sh b/pica-db-backup/mongo-run.sh index dc1fe6039d563aabfb1cf469b66b62db5a813126..169179aa30a2e322fb769143ceee6eede84a4e4f 100755 --- a/pica-db-backup/mongo-run.sh +++ b/pica-db-backup/mongo-run.sh @@ -8,7 +8,7 @@ BACKUP_FOLDER=${BACKUP_FOLDER:-"/backup/"} [ -z "${MONGO_PORT}" ] && { echo "=> MONGO_PORT cannot be empty" && exit 1; } [ -z "${MONGO_DB}" ] && { echo "=> MONGO_DB cannot be empty" && exit 1; } -ping -c 1 -W 1 "${MONGO_HOST}" || echo "${MONGO_HOST} not available, skipping backup..."; exit 1 +ping -c 1 -W 1 "${MONGO_HOST}" || { echo -e "\n=========== ${MONGO_HOST} not available, skipping backup... ===========\n"; exit 1; } if [[ -z "${MONGO_USER}" && -z "${MONGO_PASS}" ]]; then BACKUP_CMD="mongodump --forceTableScan -d ${MONGO_DB} -h ${MONGO_HOST}:${MONGO_PORT} -o $BACKUP_FOLDER"'${BACKUP_NAME}' diff --git a/pica-db-backup/mysql-run.sh b/pica-db-backup/mysql-run.sh index 0f345c7761e904f983f92084cf8a17126bc47a46..ec8526d1112e37821959d40cd4c605fa0489807d 100755 --- a/pica-db-backup/mysql-run.sh +++ b/pica-db-backup/mysql-run.sh @@ -18,7 +18,7 @@ MYSQL_PASS=${MYSQL_PASS:-${MYSQL_ENV_MYSQL_PASS}} [ -z "${MYSQL_USER}" ] && { echo "=> MYSQL_USER cannot be empty" && exit 1; } [ -z "${MYSQL_PASS}" ] && { echo "=> MYSQL_PASS cannot be empty" && exit 1; } -ping -c 1 -W 1 "${MYSQL_HOST}" || echo "${MYSQL_HOST} not available, skipping backup..."; exit 1 +ping -c 1 -W 1 "${MYSQL_HOST}" || { echo -e "\n=========== ${MYSQL_HOST} not available, skipping backup... ===========\n"; exit 1; } BACKUP_CMD="mysqldump -h${MYSQL_HOST} -P${MYSQL_PORT} -u${MYSQL_USER} -p${MYSQL_PASS} ${EXTRA_OPTS} ${MYSQL_DB} > $BACKUP_FOLDER"'${BACKUP_NAME}' diff --git a/pica-db-backup/postgres-run.sh b/pica-db-backup/postgres-run.sh index bae70c926386c7789fafec011f64f5e9a6968e6f..e52845f80f80ee4dfec9d958d4f7f3595291ab63 100755 --- a/pica-db-backup/postgres-run.sh +++ b/pica-db-backup/postgres-run.sh @@ -8,7 +8,7 @@ BACKUP_FOLDER=${BACKUP_FOLDER:-"/backup/"} [ -z "${POSTGRES_PASS}" ] && { echo "=> POSTGRES_PASS cannot be empty" && exit 1; } [ -z "${POSTGRES_DB}" ] && { echo "=> POSTGRES_DB cannot be empty" && exit 1; } -ping -c 1 -W 1 "${POSTGRES_HOST}" || echo "${POSTGRES_HOST} not available, skipping backup..."; exit 1 +ping -c 1 -W 1 "${POSTGRES_HOST}" || { echo -e "\n=========== ${POSTGRES_HOST} not available, skipping backup... ===========\n"; exit 1; } BACKUP_CMD="pg_dump -w -c > $BACKUP_FOLDER"'${BACKUP_NAME}'