xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #3935 prevent warning when using init.d script to stop edex

Browse source 
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: 80c720eac0 [formerly 06d82c9f4e] [formerly d2774cffc2] [formerly 80c720eac0 [formerly 06d82c9f4e] [formerly d2774cffc2] [formerly 6ae64007a2 [formerly d2774cffc2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]]]
Former-commit-id: 6ae64007a2
Former-commit-id: 4aa9120753 [formerly 14a6f678ca] [formerly 6e21ec9f0b987e4baff0d440cd2b78bd4c23bf29 [formerly 53f28e0b75]]
Former-commit-id: ec5ee06886fb47fbf4cb2864824b6adf3499a07f [formerly db5e0013a8]
Former-commit-id: 6794196b7c
This commit is contained in:
Brian Clements 2014-12-17 14:35:16 -06:00
parent 149d20885d
commit f2481c2d2f
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
View file

@ -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