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

2011-04-14 Dario Rodriguez <dario.rodriguez@artica.es> 

* 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
This commit is contained in:
darode 2011-04-14 16:34:03 +00:00
parent 9f4c5eeb76
commit 73a4684d7d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-14 Dario Rodriguez <dario.rodriguez@artica.es>
* 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 <rnovoa@artica.es> 2011-04-13 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/SNMPServer.pm, * lib/PandoraFMS/SNMPServer.pm,

2
pandora_server/util/tentacle_serverd
View File

@ -42,7 +42,7 @@ function get_pid {
# in a "strech" term, ps aux don't report more than COLUMNS # in a "strech" term, ps aux don't report more than COLUMNS
# characters and this will not work. # characters and this will not work.
COLUMNS=300 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 echo $TENTACLE_PID
} }