diff --git a/localdump.sh b/localdump.sh index c4e2decc568c5707869b05838204d30bd4a877b4..2665f862c507e6c1fbd54f42121d099db9e4f629 100755 --- a/localdump.sh +++ b/localdump.sh @@ -98,7 +98,8 @@ else cecho error "ERROR occured while dumping - no gzip" fi - echo -n "__DB__$SERVICENAME INFO: backup to " ls -l "$_outfile"* 2>&1 + # echo -n "__DB__$SERVICENAME INFO: backup to " + # ls -l "$_outfile"* 2>&1 echo } diff --git a/plugins/localdump/mysql.sh b/plugins/localdump/mysql.sh index 104344cef9ddc1d1a16d85e4066181dc98a4e6b3..8420cc35d5e351ac0031adf153419ceb731e766c 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} $_dbname backup " + 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 9fbd42d439de3598e6e64ef69b6b11409fe26ae7..93485afd7962056432d7393eb36946156363dcfe 100755 --- a/plugins/localdump/pgsql.sh +++ b/plugins/localdump/pgsql.sh @@ -54,7 +54,7 @@ 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} $_dbname backup " + echo -n "__DB__${SERVICENAME} backup $_dbname " OUTFILE="${BACKUP_TARGETDIR}/$(get_outfile ${DATABASE}).sql" su ${PGUSER} -c "pg_dump -Fp ${DATABASE} >$OUTFILE" fetchrc diff --git a/plugins/localdump/sqlite.sh b/plugins/localdump/sqlite.sh index 30093975d4912d0fa1bf2e11b23a1a796c06afd9..6baa5396b06f6bfcb8f9ef0b9cde53e27cde1cfb 100755 --- a/plugins/localdump/sqlite.sh +++ b/plugins/localdump/sqlite.sh @@ -36,24 +36,24 @@ function doSqliteBackup(){ for DATABASE_FILE in $(_j_getvar ${FILEDEFS} "sqlite") do - echo -n "__DB__${SERVICENAME} $_dbname backup " + echo -n "__DB__${SERVICENAME} backup $DATABASE_FILE " if [ ! -f "$DATABASE_FILE" ]; then color error - echo "ERROR: given database file does not exist: $DATABASE_FILE" + echo "ERROR: given database file does not exist" color reset rc=$rc+1 else file "$DATABASE_FILE" | cut -f 2 -d ":" | grep -i "sqlite" >/dev/null if [ $? -ne 0 ]; then color error - echo "ERROR: given database file is not a sqlite database $DATABASE_FILE" + echo "ERROR: given database file is not a sqlite database" color reset rc=$rc+1 else TARGET=$(get_outfile ${DATABASE_FILE}) TARGET=${BACKUP_TARGETDIR}/$(echo ${TARGET} | sed "s#/#_#g").sql META=${TARGET}.gz.meta - echo target: $TARGET + echo -n " to $TARGET " sqlite3 "$DATABASE_FILE" .dump >"${TARGET}" fetchrc db._compressDumpfile "${TARGET}"