cas-server | 2 +-
startup/cas-server | 51 ++++++++++++++++++---------------------------------
2 files changed, 19 insertions(+), 34 deletions(-)
New commits:
commit ae48b20c63030551a58643c00e18eb130a92e6f2
Author: adam stokes <astokes(a)fedoraproject.org>
Date: Tue May 25 17:49:58 2010 -0400
initscripts working
diff --git a/cas-server b/cas-server
index 5d84b8b..d77ed8d 100755
--- a/cas-server
+++ b/cas-server
@@ -1,3 +1,3 @@
#!/bin/sh
-exec python "/usr/share/cas/overseer/command.py" "$@"
+python "/usr/share/cas/overseer/command.py"
diff --git a/startup/cas-server b/startup/cas-server
index ab420ca..deb1ee8 100755
--- a/startup/cas-server
+++ b/startup/cas-server
@@ -1,6 +1,6 @@
#!/bin/sh
# -*- mode: sh; -*-
-# cas-server Start/Stop the cas-server.
+# cas-server Start/Stop the cas-server.
#
# chkconfig: 2345 90 60
# description: cas-server is the web frontend to CAS ( core analysis system )
@@ -25,27 +25,21 @@ prog="cas-server"
[ -f /etc/cas.conf ] || exit 0
# bin
-SERVER="/usr/share/cas/overseer/command.py"
-LOCK_FILE="/var/lock/subsys/cas-server"
+SERVER=/usr/share/cas/overseer/command.py
+LOCK_FILE=/var/lock/subsys/cas-server
RETVAL=0
-start () {
+start() {
echo -n "Starting $prog: "
- status -p $LOCK_FILE $SERVER &> /dev/null
- STATUS=$?
- if [ $STATUS -eq 0 ]; then
- echo -n "Cas server already running."
- echo_failure
- RETVAL=0
+ daemon $SERVER 2> /dev/null
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ success
else
- if [ $STATUS -eq 1 ]; then
- echo -n "Stray lockfile, removing."
- rm -f $LOCK_FILE
- fi
- daemon $SERVER
- RETVAL=$?
+ failure
fi
+ echo
}
stop() {
@@ -53,24 +47,13 @@ stop() {
RETVAL=$?
if [ -f "$LOCK_FILE" ]; then
killproc -p $LOCK_FILE $SERVER
- sleep 1
RETVAL=$?
- echo
[ $RETVAL -eq 0 ] && rm -f $LOCK_FILE
- echo_success
+ success
else
- echo_failure
+ failure
fi
-}
-
-restart() {
- stop
- start
-}
-
-status() {
- status -p $LOCK_FILE $SERVER
- RETVAL=$?
+ echo
}
case "$1" in
@@ -81,13 +64,15 @@ case "$1" in
stop
;;
restart)
- restart
+ stop
+ sleep 1
+ start
;;
status)
- status
+ status $SERVER
;;
*)
- echo $"Usage: $0 {start|stop|status|restart|}"
+ echo $"Usage: $0 {start|stop|status|restart}"
exit 1
esac
exit $RETVAL
Show replies by date