From 22dcefdde228d40a1cc03fc3b723284a743563f6 Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 20 Jul 2007 11:02:20 +0000 Subject: [PATCH] 2006-07-20 Sancho Lerena * Fixed last commit (commited three testing/debug) files not to be in svn. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/pandora_network | 7 +++---- pandora_server/pandora_recon | 6 ++---- pandora_server/pandora_server | 3 +-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pandora_server/pandora_network b/pandora_server/pandora_network index f6820bf0c7..f3338a6f32 100755 --- a/pandora_server/pandora_network +++ b/pandora_server/pandora_network @@ -3,12 +3,11 @@ # Pandora Network Server, startup script # Sancho Lerena, # Linux Version (generico) -# v1.3 +# v1.3 (Jul/2007) # Configurable path and filenames PANDORA_HOME="/usr/share/pandora_server" PANDORA_NETWORK_PID="/var/run/pandora/pandora_network.pid" -#PANDORA_NETWORK_PID="$PANDORA_HOME/var/pandora_network.pid" # Main script @@ -28,14 +27,14 @@ case "$1" in fi cd $PANDORA_HOME/bin - nohup ./pandora_network.pl $PANDORA_HOME -D 2> /dev/null + ./pandora_network.pl $PANDORA_HOME -D MYPID=`ps aux | grep 'pandora_network.pl' | grep -v grep | tail -1 | awk '{print $2}'` if [ ! -z "$MYPID" ] then echo $MYPID > $PANDORA_NETWORK_PID echo "Pandora Network Server is now running with PID $MYPID" else - echo "Cannot start Pandora FMS Network Server. Aborted" + echo "Cannot start Pandora FMS Network Server. Aborted." fi cd "$OLD_PATH" ;; diff --git a/pandora_server/pandora_recon b/pandora_server/pandora_recon index 0d7465ac37..3bd327a829 100755 --- a/pandora_server/pandora_recon +++ b/pandora_server/pandora_recon @@ -2,12 +2,11 @@ # Pandora FMS Recon Server, startup script # Sancho Lerena, # Linux Version (generic) -# v1.3 (Mar/2007) +# v1.3 (Jul/2007) # Configurable path and filenames PANDORA_HOME="/usr/share/pandora_server" PANDORA_PID="/var/run/pandora/pandora_recon.pid" -#PANDORA_PID="$PANDORA_HOME/var/pandora_recon.pid" # Main script @@ -31,8 +30,7 @@ case "$1" in fi cd $PANDORA_HOME/bin - nohup ./pandora_recon.pl $PANDORA_HOME & - sleep 1 + ./pandora_recon.pl $PANDORA_HOME -D MYPID=`ps aux | grep 'pandora_recon.pl' | grep -v grep | tail -1 | awk '{print $2}'` if [ ! -z "$MYPID" ] then diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server index 0df881e0b6..ae065efbcb 100755 --- a/pandora_server/pandora_server +++ b/pandora_server/pandora_server @@ -2,12 +2,11 @@ # Pandora Data Server startup script # Sancho Lerena, # Linux Version (generic) -# v1.3 (May/2007) +# v1.3 (Jul/2007) # Configurable path and filenames PANDORA_HOME="/usr/share/pandora_server" PANDORA_SERVER_PID="/var/run/pandora/pandora_server.pid" -#PANDORA_SERVER_PID="$PANDORA_HOME/var/pandora_server.pid" # Main script