From 88b787718d190b01101c656f805bf32f9b116137 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 24 Jun 2008 15:55:10 +0000 Subject: pgsql, mysql, svn: use new vservers_running function from lib/vserver (factorization++) --- handlers/mysql.in | 5 +---- handlers/pgsql.in | 5 +---- handlers/svn.in | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'handlers') 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 -- cgit v1.2.3