Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2016-06-20 12:37:41 +02:00
commit 631bb7663c

View file

@ -12,22 +12,16 @@ NAME=MistController
DESC="MistServer" DESC="MistServer"
CFG_FILE=/etc/mistserver.conf CFG_FILE=/etc/mistserver.conf
LOG_FILE=/var/log/mistserver.log LOG_FILE=/var/log/mistserver.log
PID_FILE=/var/run/mistserver.pid
# Source function library.
. /etc/rc.d/init.d/functions
# #
# Function that starts the daemon/service # Function that starts the daemon/service
# #
do_start() do_start()
{ {
echo -n "Starting $DESC" "$NAME" echo "Starting $DESC" "$NAME"
MistController -d -L $LOG_FILE -c $CFG_FILE MistController -L $LOG_FILE -c $CFG_FILE &
RETVAL=$? RETVAL=$?
[ $RETVAL = 0 ] && touch /var/lock/subsys/$NAME && echo $!>$PID_FILE && echo_success || echo_failure [ $RETVAL = 0 ] && echo "Success" || echo "Failure"
echo
return $RETVAL return $RETVAL
} }
@ -36,22 +30,18 @@ do_start()
# #
do_stop() do_stop()
{ {
echo -n "Stopping $DESC" "$NAME" echo "Stopping $DESC" "$NAME"
killall MistController >/dev/null 2>&1 kill `pidof MistController` >/dev/null 2>&1
RETVAL=$? RETVAL=$?
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$NAME $PID_FILE && echo_success || echo_failure [ $RETVAL = 0 ] && echo "Success" || echo "Failure"
echo
return $RETVAL return $RETVAL
} }
do_restart() do_restart()
{ {
echo -n "Restarting $DESC" "$NAME" do_stop
[[ -f /var/lock/subsys/$NAME ]] && killall MistController >/dev/null 2>&1 && rm -f /var/lock/subsys/$NAME $PID_FILE && sleep 2 sleep 10
MistController -d -L $LOG_FILE -c $CFG_FILE do_start
RETVAL=$?
[ $RETVAL = 0 ] && touch /var/lock/subsys/$NAME && echo $!>$PID_FILE && echo_success || echo_failure
echo
return $RETVAL return $RETVAL
} }
@ -70,3 +60,4 @@ case "$1" in
exit 3 exit 3
;; ;;
esac esac