From 73a4684d7d0a803846e1e999d8e5a6fe34425dfe Mon Sep 17 00:00:00 2001 From: darode Date: Thu, 14 Apr 2011 16:34:03 +0000 Subject: [PATCH] 2011-04-14 Dario Rodriguez * util/tentacle_serverd: Changed get_pid function now also checks tentacle_port when searchs for running tentacle server. This feature allow you to run 2 tentacle server in different ports 1 for Pandora and 1 for Babel. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4225 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 7 +++++++ pandora_server/util/tentacle_serverd | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b194875f40..a4ea2de907 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,10 @@ +2011-04-14 Dario Rodriguez + + * util/tentacle_serverd: Changed get_pid function now also checks + tentacle_port when searchs for running tentacle server. This feature + allow you to run 2 tentacle server in different ports 1 for Pandora and + 1 for Babel. + 2011-04-13 Ramon Novoa * lib/PandoraFMS/SNMPServer.pm, diff --git a/pandora_server/util/tentacle_serverd b/pandora_server/util/tentacle_serverd index f48ec2245f..bba4acc199 100755 --- a/pandora_server/util/tentacle_serverd +++ b/pandora_server/util/tentacle_serverd @@ -42,7 +42,7 @@ function get_pid { # in a "strech" term, ps aux don't report more than COLUMNS # characters and this will not work. COLUMNS=300 - TENTACLE_PID=`ps -Af | grep "$TENTACLE_PATH$TENTACLE_DAEMON" | grep -v grep | tail -1 | awk '{ print $2 }'` + TENTACLE_PID=`ps -Af | grep "$TENTACLE_PATH$TENTACLE_DAEMON" | grep "$TENTACLE_PORT" | grep -v grep | tail -1 | awk '{ print $2 }'` echo $TENTACLE_PID }