From 4b295f0363c0aae98eae96577b11e1b0dd8815d8 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch>
Date: Thu, 17 Mar 2022 13:44:38 +0100
Subject: [PATCH] update prefix __DB__
---
localdump.sh | 4 ++--
plugins/localdump/mysql.sh | 2 +-
plugins/localdump/pgsql.sh | 4 ++--
plugins/localdump/sqlite.sh | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/localdump.sh b/localdump.sh
index 2665f86..f3c0b18 100755
--- a/localdump.sh
+++ b/localdump.sh
@@ -96,11 +96,11 @@
cecho error "FAILED"
fi
else
- cecho error "ERROR occured while dumping - no gzip"
+ cecho error "ERROR occured while dumping - no gzip of $_outfile"
fi
# echo -n "__DB__$SERVICENAME INFO: backup to "
# ls -l "$_outfile"* 2>&1
- echo
+ # echo
}
# ----------------------------------------------------------------------
diff --git a/plugins/localdump/mysql.sh b/plugins/localdump/mysql.sh
index 8420cc3..f0dfebb 100755
--- a/plugins/localdump/mysql.sh
+++ b/plugins/localdump/mysql.sh
@@ -158,7 +158,7 @@ function mysql.backup(){
for _dbname in $( mysql.db.list )
do
- echo -n "__DB__${SERVICENAME} backup $_dbname "
+ echo -n "__DB__${SERVICENAME} backup $_dbname ... "
_outfile="${BACKUP_TARGETDIR}/$(get_outfile ${_dbname}).sql"
mysql.db.dump "$_dbname" "$_outfile"
diff --git a/plugins/localdump/pgsql.sh b/plugins/localdump/pgsql.sh
index 93485af..141ba22 100755
--- a/plugins/localdump/pgsql.sh
+++ b/plugins/localdump/pgsql.sh
@@ -54,10 +54,10 @@ function doPgsqlBackup(){
sSqlGetDblist="select datname from pg_database where not datistemplate and datallowconn order by datname;"
for DATABASE in $(su ${PGUSER} -c "psql -At -c '$sSqlGetDblist' postgres" 2>/dev/null)
do
- echo -n "__DB__${SERVICENAME} backup $_dbname "
+ echo -n "__DB__${SERVICENAME} backup $_dbname ... "
OUTFILE="${BACKUP_TARGETDIR}/$(get_outfile ${DATABASE}).sql"
su ${PGUSER} -c "pg_dump -Fp ${DATABASE} >$OUTFILE"
- fetchrc
+ fetchrc >/dev/null
db._compressDumpfile "$OUTFILE"
diff --git a/plugins/localdump/sqlite.sh b/plugins/localdump/sqlite.sh
index 6baa539..64e755a 100755
--- a/plugins/localdump/sqlite.sh
+++ b/plugins/localdump/sqlite.sh
@@ -53,9 +53,9 @@ function doSqliteBackup(){
TARGET=$(get_outfile ${DATABASE_FILE})
TARGET=${BACKUP_TARGETDIR}/$(echo ${TARGET} | sed "s#/#_#g").sql
META=${TARGET}.gz.meta
- echo -n " to $TARGET "
+ # echo -n " to $TARGET "
sqlite3 "$DATABASE_FILE" .dump >"${TARGET}"
- fetchrc
+ fetchrc >/dev/null
db._compressDumpfile "${TARGET}"
# $myrc is last returncode - set in fetchrc
--
GitLab