From 6ae64007a2259adec4d1302582f3645e60605153 Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Wed, 17 Dec 2014 14:35:16 -0600
Subject: [PATCH] Issue #3935 prevent warning when using init.d script to stop
 edex

Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: b1034aa16b3393e6584038ebb80faf2a4e1a831f
---
 .../Installer.edex/scripts/init.d/edex_camel          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
index a55038350e..13f00d5d02 100644
--- a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
+++ b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
@@ -64,6 +64,11 @@ getCamelAndWrapperPids() {
    if [ "$_camel_pid" != "" ]; then
       # grab wrapper pid from edex process, run throw awk to throw away leading white space
       _wrapper_pid=`ps --no-headers -p $_camel_pid -o ppid | awk '{print $1}'`
+      # if wrapper died, camel's parent will be 1, don't report that as the wrapper
+      if [ "$_wrapper_pid" == "1" ]
+      then
+          _wrapper_pid=""
+      fi
    else
       # camel not up, double check wrapper pid file
       pidfile=${EDEX_INSTALL}/bin/${1}.pid
@@ -138,7 +143,11 @@ stopEDEX() {
    savepid=$_wrapper_pid
    while [ "${_wrapper_pid}${_camel_pid}" != "" ]; do
       if [ "$_wrapper_pid" != "$savepid" ]; then
-         echo "WARNING: EDEX ${1} instance running under new pid, started by another user?"
+         # only display warning when other wrapper starts (not if wrapper died)
+         if [ -n "$_wrapper_pid" ]
+         then
+            echo "WARNING: EDEX ${1} instance running under new pid, started by another user?"
+         fi
          return 1
       fi