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

2013-04-08 Hirofumi Kosaka <kosaka@rworks.jp> 

* util/pandora_server: Small improvement. Pinned target
	process id to be killed when stopping Pandora Server, to avoid
	to kill other processes that could be invoked in different
	session by chance.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7939 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2013-04-08 03:09:05 +00:00
parent 17b93ba14c
commit d97fda5423
2 changed files with 10 additions and 3 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 @@
2013-04-08 Hirofumi Kosaka <kosaka@rworks.jp>
* util/pandora_server: Small improvement. Pinned target
process id to be killed when stopping Pandora Server, to avoid
to kill other processes that could be invoked in different
session by chance.
2013-04-07 Junichi Satoh <junichi@rworks.jp>
* Makefile.PL: Changed library installation path for NetBSD.

6
pandora_server/util/pandora_server
View File

@ -108,8 +108,8 @@ case "$1" in
while [ $COUNTER -lt $MAXWAIT ]
do
PANDORA_PID=`pidof_pandora`
if [ -z "$PANDORA_PID" ]
_PID=`pidof_pandora`
if [ "$_PID" != "$PANDORA_PID" ]
then
COUNTER=$MAXWAIT
fi
@ -119,7 +119,7 @@ case "$1" in
# Send a KILL -9 signal to process, if it's alive after 60secs, we need
# to be sure is really dead, and not pretending...
if [ ! -z "$PANDORA_PID" ]
if [ "$_PID" = "$PANDORA_PID" ]
then
kill -9 $PANDORA_PID > /dev/null 2>&1
fi