aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2008-06-24 15:55:10 +0000
committerintrigeri <intrigeri@boum.org>2008-06-24 15:55:10 +0000
commit88b787718d190b01101c656f805bf32f9b116137 (patch)
treed5993068e9784ee4896f692c88b3d233e0f96ff2
parent6c628e78f4f64680b5cec6b8062fe7e0f654043b (diff)
downloadbackupninja-88b787718d190b01101c656f805bf32f9b116137.tar.gz
backupninja-88b787718d190b01101c656f805bf32f9b116137.tar.bz2
pgsql, mysql, svn: use new vservers_running function from lib/vserver (factorization++)
-rw-r--r--ChangeLog2
-rw-r--r--handlers/mysql.in5
-rw-r--r--handlers/pgsql.in5
-rw-r--r--handlers/svn.in5
4 files changed, 5 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index b7c2a77..09c4747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@ version 0.9.6 -- unreleased
. make deleted maildirs record the date they were deleted
. add destid_file configuration option to enable you to specify an alternate
ssh public key authentication file (defaulting to /root/.ssh/id_rsa)
+ pgsql, mysql, svn:
+ . use new vservers_running function from lib/vserver (factorization++)
sys:
. update for 2.6 kernels: use /proc/kallsyms instead of /proc/ksyms
(Closes: Trac#39)
diff --git a/handlers/mysql.in b/handlers/mysql.in
index defb72a..fe1e783 100644
--- a/handlers/mysql.in
+++ b/handlers/mysql.in
@@ -31,10 +31,7 @@ if [ $vservers_are_available = yes ]; 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
+ vservers_running $vsname || fatal "The vserver $vsname is not running."
# everything ok
info "Using vserver '$vsname'."
usevserver=yes
diff --git a/handlers/pgsql.in b/handlers/pgsql.in
index 1b4a452..f334bf2 100644
--- a/handlers/pgsql.in
+++ b/handlers/pgsql.in
@@ -21,10 +21,7 @@ if [ $vservers_are_available = yes ]; 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
+ vservers_running $vsname || fatal "The vserver $vsname is not running."
# everything ok
info "Using vserver '$vsname'."
usevserver=yes
diff --git a/handlers/svn.in b/handlers/svn.in
index 377d71c..d19b0b8 100644
--- a/handlers/svn.in
+++ b/handlers/svn.in
@@ -22,10 +22,7 @@ if [ $vservers_are_available = yes ]; 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
+ vservers_running $vsname || fatal "The vserver $vsname is not running."
# everything ok
info "Using vserver '$vsname'."
usevserver=yes