From 88b787718d190b01101c656f805bf32f9b116137 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 24 Jun 2008 15:55:10 +0000
Subject: [PATCH] pgsql, mysql, svn: use new vservers_running function from
lib/vserver (factorization++)
---
ChangeLog | 2 ++
handlers/mysql.in | 5 +----
handlers/pgsql.in | 5 +----
handlers/svn.in | 5 +----
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b7c2a77c..09c4747f 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 defb72aa..fe1e7832 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 1b4a4521..f334bf2f 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 377d71c6..d19b0b8c 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
--
GitLab