diff options
| author | intrigeri <intrigeri@boum.org> | 2006-01-19 21:58:03 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2006-01-19 21:58:03 +0000 |
| commit | b52464c19e50b738902e3333172b67d2b7c503b7 (patch) | |
| tree | 662b0e99633bcd35f1b1c721e22320f7acf08e1a /handlers/pgsql | |
| parent | d600ba40c040c6a75a5b817f80184f60d9dc6eaf (diff) | |
| download | backupninja-b52464c19e50b738902e3333172b67d2b7c503b7.tar.gz backupninja-b52464c19e50b738902e3333172b67d2b7c503b7.tar.bz2 | |
clean up and homogenize pgsql and mysql vserver checks
Diffstat (limited to 'handlers/pgsql')
| -rw-r--r-- | handlers/pgsql | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/handlers/pgsql b/handlers/pgsql index 8629260..2b6f25a 100644 --- a/handlers/pgsql +++ b/handlers/pgsql @@ -10,45 +10,48 @@ getconf vsname localhost=`hostname` -# If vservers are enabled, check that $vsname exists, and decide if the -# handler should use it or if it should just operate on the host. +# Decide if the handler should operate on a vserver or on the host. +# In the former case, check that $vsname exists and is running. local usevserver=no +local vroot if [ $vservers_are_available = yes ]; then - if ! vservers_exist "$vsname" ; then - fatal "The vserver given in vsname ($vsname) does not exist." - else - info "using vserver '$vsname'" + if [ -z "$vsname" ]; then + # does it exist ? + if ! vservers_exist "$vsname" ; then + fatal "The vserver given in vsname ($vsname) does not exist." + fi + # is it running ? + $VSERVERINFO -q $vsname RUNNING + if [ $? -ne 0 ]; then + fatal "The vserver $vsname is not running." + fi + # everything ok + info "Using vserver '$vsname'." usevserver=yes + vroot="$VROOTDIR/$vsname" + else + info "No vserver name specified, actions will be performed on the host." fi fi -# As needed, make sure that : -# * the specified vserver is running -# * the specified vserver or host has the needed executables +# Make sure that the system to backup has the needed executables if [ $usevserver = yes ]; then - info "examining vserver '$vsname'" - vroot="$VROOTDIR/$vsname" - # is it running ? - running=`$VSERVERINFO $vsname RUNNING` - if [ "$running" = "1" ]; then - if [ "$databases" == "all" ]; then - [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \ - fatal "Can't find $PGSQLDUMPALL in vserver $vsname." - else - [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMP`" ] || \ - fatal "Can't find $PGSQLDUMP in vserver $vsname." - fi - else - fatal "vserver $vsname is not running." - fi + debug "Examining vserver '$vsname'." + if [ "$databases" == "all" ]; then + [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMPALL`" ] || \ + fatal "Can't find $PGSQLDUMPALL in vserver $vsname." + else + [ -x "$vroot`$VSERVER $vsname exec which $PGSQLDUMP`" ] || \ + fatal "Can't find $PGSQLDUMP in vserver $vsname." + fi else - if [ "$databases" == "all" ]; then - [ -x "`which $PGSQLDUMPALL`" ] || \ - fatal "Can't find $PGSQLDUMPALL." - else - [ -x "`which $PGSQLDUMP`" ] || \ - fatal "Can't find $PGSQLDUMP." - fi + if [ "$databases" == "all" ]; then + [ -x "`which $PGSQLDUMPALL`" ] || \ + fatal "Can't find $PGSQLDUMPALL." + else + [ -x "`which $PGSQLDUMP`" ] || \ + fatal "Can't find $PGSQLDUMP." + fi fi # create backup dir, the vroot variable will be empty if no vsname was specified |