tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2010-08-29 Raul Mateos <raulofpandora@gmail.com> 

* util/tentacle_serverd: Use same message texts format as Pandora Server.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3187 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
raulmateos 2010-08-29 21:41:22 +00:00
parent ae842a669d
commit 162bb7cff6
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_server/ChangeLog
View File

@ -1,3 +1,7 @@
2010-08-29 Raúl Mateos <raulofpandora@gmail.com>
* util/tentacle_serverd: Use same message texts format as Pandora Server.
2010-08-18 Sancho Lerena <slerena@artica.es> 2010-08-18 Sancho Lerena <slerena@artica.es>
* lib/PandoraFMS/Core.pm: Alerts now uses _timestamp_ macro with the * lib/PandoraFMS/Core.pm: Alerts now uses _timestamp_ macro with the

20
pandora_server/util/tentacle_serverd
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Copyright (c) 2005-2010 Artica ST # Copyright (c) 2005-2010 Artica ST
# #
# Author: Sancho Lerena <slerena@artica.es> 2006-2009 # Author: Sancho Lerena <slerena@artica.es> 2006-2010
# #
# /etc/init.d/tentacle_server # /etc/init.d/tentacle_server
# #
@ -71,7 +71,7 @@ case "$TENTACLE_PATH" in
esac esac
if [ ! -f "${TENTACLE_PATH}$TENTACLE_DAEMON" ]; then if [ ! -f "${TENTACLE_PATH}$TENTACLE_DAEMON" ]; then
echo "Tentacle server not found in ${TENTACLE_PATH}$TENTACLE_DAEMON." echo "Tentacle Server not found in ${TENTACLE_PATH}$TENTACLE_DAEMON"
rc_failed 1 rc_failed 1
rc_exit rc_exit
fi fi
@ -80,7 +80,7 @@ case "$1" in
start) start)
TENTACLE_PID=`get_pid` TENTACLE_PID=`get_pid`
if [ ! -z "$TENTACLE_PID" ]; then if [ ! -z "$TENTACLE_PID" ]; then
echo "Tentacle server is already running with PID $TENTACLE_PID." echo "Tentacle Server is already running with PID $TENTACLE_PID"
rc_failed 2 rc_failed 2
rc_exit rc_exit
fi fi
@ -90,10 +90,10 @@ case "$1" in
TENTACLE_PID=`get_pid` TENTACLE_PID=`get_pid`
if [ ! -z "$TENTACLE_PID" ]; then if [ ! -z "$TENTACLE_PID" ]; then
echo "Tentacle server is now running with PID $TENTACLE_PID." echo "Tentacle Server is now running with PID $TENTACLE_PID"
rc_status -v rc_status -v
else else
echo "Tentacle server could not be started." echo "Tentacle Server could not be started."
echo "Verify that port $TENTACLE_PORT is not used." echo "Verify that port $TENTACLE_PORT is not used."
rc_status -v rc_status -v
fi fi
@ -103,7 +103,7 @@ case "$1" in
stop) stop)
TENTACLE_PID=`get_pid` TENTACLE_PID=`get_pid`
if [ -z "$TENTACLE_PID" ]; then if [ -z "$TENTACLE_PID" ]; then
echo "Tentacle server does not seem to be running." echo "Tentacle Server does not seem to be running"
rc_failed 2 rc_failed 2
else else
kill $TENTACLE_PID kill $TENTACLE_PID
@ -111,11 +111,11 @@ case "$1" in
TENTACLE_PID=`get_pid` TENTACLE_PID=`get_pid`
if [ ! -z "$TENTACLE_PID" ]; then if [ ! -z "$TENTACLE_PID" ]; then
echo "Tentacle server could not be stopped." echo "Tentacle Server could not be stopped"
rc_status -s rc_status -s
fi fi
echo "Tentacle server stopped." echo "Stopping Tentacle Server"
rc_status -v rc_status -v
fi fi
@ -131,10 +131,10 @@ case "$1" in
status) status)
TENTACLE_PID=`get_pid` TENTACLE_PID=`get_pid`
if [ -z "$TENTACLE_PID" ]; then if [ -z "$TENTACLE_PID" ]; then
echo "Tentacle server is not running." echo "Tentacle Server is not running."
rc_status rc_status
else else
echo "Tentacle server is running with PID $TENTACLE_PID." echo "Tentacle Server is running with PID $TENTACLE_PID."
rc_status rc_status
fi fi