From 2c5c43fa091b3a4b6446e44f6e2761f66f04c43d Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Thu, 1 Mar 2012 10:10:44 +0100
Subject: [PATCH] doplneny exit stavy do funkce status; prejmenovany funkce
start, stop, status
---
src/warden-server/bin/wardend | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/warden-server/bin/wardend b/src/warden-server/bin/wardend
index cd5f798..237c4e7 100755
--- a/src/warden-server/bin/wardend
+++ b/src/warden-server/bin/wardend
@@ -50,7 +50,7 @@ LOCK_FILE="/var/lock/warden-server"
SCRIPTNAME=`basename "$0"`
# check if daemon is present and executable
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
if [ $UID -ne 0 ]; then
echo "You must be root for runnnig this script!"
@@ -63,8 +63,7 @@ usage() {
}
check_status() {
- /bin/ps axo pid,comm | grep -q "warden-server*"; RET_VAL=`echo $?`
- if [ $RET_VAL -eq 0 ]; then
+ if /bin/ps axo pid,comm | grep -q "warden-server*"; then
STATUS=1 # true - warden is running
else
STATUS=0 # false - warden is not running
@@ -76,7 +75,7 @@ get_pid() {
return $PID
}
-warden_start() {
+start() {
check_status
if [ $STATUS -eq 1 ]; then
get_pid PID
@@ -90,7 +89,7 @@ warden_start() {
fi
}
-warden_stop() {
+stop() {
check_status
if [ $STATUS -eq 1 ]; then
logger -s "Stopping Warden server daemon ..."
@@ -98,7 +97,7 @@ warden_stop() {
PID=`cat $PID_FILE`
kill -1 $PID
rm -f $LOCK_FILE
- logger -s "Warden server daemon is stopped (pid $PID)."
+ logger -s "Warden server daemon (pid $PID) is stopped."
else
echo "Unable to stop Warden server daemon. Try to use: $SCRIPTNAME force-stop"
fi
@@ -107,17 +106,19 @@ warden_stop() {
fi
}
-warden_status() {
+status() {
check_status
if [ $STATUS -eq 1 ]; then
get_pid PID
echo "Warden daemon is running (pid $PID)."
+ exit 0
else
echo "Warden daemon is NOT running."
+ exit 1
fi
}
-warden_force_stop() {
+force_stop() {
check_status
if [ $STATUS -eq 1 ]; then
logger -s "Force stopping Warden server daemon ..."
@@ -134,16 +135,16 @@ warden_force_stop() {
case $1 in
status)
- warden_status
+ status
;;
start)
- warden_start
+ start
;;
stop)
- warden_stop
+ stop
;;
force-stop)
- warden_force_stop
+ force_stop
;;
restart)
$0 stop
--
GitLab