Omaha #4530 Use the same PID for the startup-shutdown log

Change-Id: Ie281558f1626c1f08ef54057c96190d11d7d78db

Former-commit-id: f644b90915ecae3fea88f9224d9e9b27d1229a61
This commit is contained in:
David Lovely 2015-05-28 11:22:55 -05:00
parent 44d955ceb5
commit ee34457d03

View file

@ -69,7 +69,7 @@ copyVizShutdownUtilIfNecessary
deleteOldCaveDiskCaches &
# Enable core dumps
ulimit -c unlimited
ulimit -c unlimited >> /dev/null 2>&1
export LD_LIBRARY_PATH=${JAVA_INSTALL}/lib:${PYTHON_INSTALL}/lib:$LD_LIBRARY_PATH
export LD_PRELOAD=libpython.so
@ -207,14 +207,14 @@ deleteOldCaveLogs &
curTime=`date +%Y%m%d_%H%M%S`
pid=$!
export LOGFILE_STARTUP_SHUTDOWN="${LOGDIR}/${PROGRAM_NAME}_${pid}_${curTime}_pid_%PID%_startup-shutdown.log"
# At this point fork so that log files can be set up with the process pid and
# this process can log the exit status of cave.
(
export pid=`/bin/bash -c 'echo $PPID'`
# we include the PID of the launching process along with
# a %PID% placeholder to be replaced with the "real" PID
LOGFILE_STARTUP_SHUTDOWN="${LOGDIR}/${PROGRAM_NAME}_${pid}_${curTime}_pid_%PID%_startup-shutdown.log"
export LOGFILE_CAVE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_logs.log"
export LOGFILE_CONSOLE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_console.log"
export LOGFILE_PERFORMANCE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_perf.log"
@ -260,7 +260,5 @@ curTime=`date +%Y%m%d_%H%M%S`
) &
pid=$!
LOGFILE_STARTUP_SHUTDOWN="${LOGDIR}/${PROGRAM_NAME}_${pid}_${curTime}_pid_%PID%_startup-shutdown.log"
logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN