mysql and dup handlers: when using a vserver, check if it is running

[matthijs/upstream/backupninja.git] / backupninja

diff --git a/backupninja b/backupninja
index aba997e50a4de87e44f17728cbc19a051eaf6305..e5c55aea505aef9912feafa5cb91ddc95fe42465 100755 (executable)
--- a/backupninja
+++ b/backupninja
@@ -279,8 +279,10 @@ function process_action() {
        getconf when "$defaultwhen"
        if [ "$processnow" == 1 ]; then
                info ">>>> starting action $file (because of --now)"
+               run="yes"
        elif [ "$when" == "hourly" ]; then
                info ">>>> starting action $file (because 'when = hourly')"
+               run="yes"
        else
                IFS=$'\t\n'
                for w in $when; do
@@ -297,6 +299,7 @@ function process_action() {
                done
                IFS=$' \t\n'
        fi
+       debug $run
        [ "$run" == "no" ] && return
        
        let "actions_run += 1"
@@ -435,6 +438,8 @@ getconf RDIFFBACKUP /usr/bin/rdiff-backup
 getconf MYSQL /usr/bin/mysql
 getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
 getconf MYSQLDUMP /usr/bin/mysqldump
+getconf PGSQLDUMP /usr/bin/pg_dump
+getconf PGSQLDUMPALL /usr/bin/pg_dumpall
 getconf GZIP /bin/gzip
 getconf RSYNC /usr/bin/rsync
 getconf vservers no
@@ -474,7 +479,7 @@ errormsg=""
 if [ "$singlerun" ]; then
        files=$singlerun
 else
-       files=`find $configdirectory -mindepth 1 | sort -n`
+       files=`find $configdirectory ! -name '.*.swp' -mindepth 1 | sort -n`
 fi
 
 for file in $files; do