From d4f1c91483448bb51d939fd19a26b3349f483404 Mon Sep 17 00:00:00 2001 From: hkosaka Date: Mon, 8 Apr 2013 08:43:44 +0000 Subject: [PATCH] 2013-04-08 Hirofumi Kosaka * util/tentacle_serverd: Tiny improvement. Changed to use target process id to check if the process has been stopped. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7942 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/util/tentacle_serverd | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 093dbc625d..80224be2c5 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2013-04-08 Hirofumi Kosaka + + * util/tentacle_serverd: Tiny improvement. Changed to use + target process id to check if the process has been stopped. + 2013-04-08 Hirofumi Kosaka * util/pandora_server: Small improvement. Pinned target diff --git a/pandora_server/util/tentacle_serverd b/pandora_server/util/tentacle_serverd index bba4acc199..4e4947ac76 100755 --- a/pandora_server/util/tentacle_serverd +++ b/pandora_server/util/tentacle_serverd @@ -113,9 +113,9 @@ case "$1" in else kill $TENTACLE_PID sleep 1 - TENTACLE_PID=`get_pid` + _PID=`get_pid` - if [ ! -z "$TENTACLE_PID" ]; then + if [ "$_PID" = "$TENTACLE_PID" ]; then echo "Tentacle Server could not be stopped" rc_status -s fi