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

cave/run.sh concerns

Browse source
This commit is contained in:
mjames-upc 2015-12-30 19:48:12 -07:00
parent 145cd1e0d2
commit 948920a213
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/build/static/linux/cave/caveUtil.sh
View file

@ -46,7 +46,7 @@ if [ ${RC} -ne 0 ]; then
exit 1 exit 1
fi fi
# This script will be sourced by cave.sh. # This script will be sourced by run.sh.
export CAVE_INI_ARG= export CAVE_INI_ARG=
BYTES_IN_KB=1024 BYTES_IN_KB=1024

10
cave/build/static/linux/cave/run.sh
View file

@ -69,7 +69,7 @@ copyVizShutdownUtilIfNecessary
deleteOldCaveDiskCaches & deleteOldCaveDiskCaches &
# Enable core dumps # 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_LIBRARY_PATH=${JAVA_INSTALL}/lib:${PYTHON_INSTALL}/lib:$LD_LIBRARY_PATH
export LD_PRELOAD=libpython.so export LD_PRELOAD=libpython.so
@ -207,14 +207,14 @@ deleteOldCaveLogs &
curTime=`date +%Y%m%d_%H%M%S` 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 # 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. # 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 # we include the PID of the launching process along with
# a %PID% placeholder to be replaced with the "real" PID # 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_CAVE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_logs.log"
export LOGFILE_CONSOLE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_console.log" export LOGFILE_CONSOLE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_console.log"
export LOGFILE_PERFORMANCE="${LOGDIR}/${PROGRAM_NAME}_${curTime}_pid_%PID%_perf.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=$! pid=$!
LOGFILE_STARTUP_SHUTDOWN="${LOGDIR}/${PROGRAM_NAME}_${pid}_${curTime}_pid_%PID%_startup-shutdown.log"
logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN logExitStatus $pid $LOGFILE_STARTUP_SHUTDOWN

4
cave/com.raytheon.viz.gfe/GFESuite/gfeclient.sh
View file

@ -26,7 +26,7 @@
# ------------ ---------- ----------- -------------------------- # ------------ ---------- ----------- --------------------------
# Dec 05, 2013 #2593 rjpeter set IGNORE_NUM_CAVES # Dec 05, 2013 #2593 rjpeter set IGNORE_NUM_CAVES
# Dec 05, 2013 #2590 dgilling Remove duplicated code and call to # Dec 05, 2013 #2590 dgilling Remove duplicated code and call to
# cave.sh. # run.sh.
# #
# #
@ -64,7 +64,7 @@ fi
export IGNORE_NUM_CAVES=1 export IGNORE_NUM_CAVES=1
source /awips2/cave/cave.sh -nosplash -noredirect -component gfeclient "$@" & source /awips2/cave/run.sh -nosplash -noredirect -component gfeclient "$@" &
wait $! wait $!
if [ -n "$xvfb" ] if [ -n "$xvfb" ]

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/svcbu.properties
View file

@ -112,7 +112,7 @@ IFPS_LOG=/awips2/GFESuite/ServiceBackup/logs
IFPS_DATA=/awips2/GFESuite/ServiceBackup/data IFPS_DATA=/awips2/GFESuite/ServiceBackup/data
LOCK_DIR=/awips2/GFESuite/ServiceBackup/locks LOCK_DIR=/awips2/GFESuite/ServiceBackup/locks
SCRIPTS_DIR=/awips2/GFESuite/ServiceBackup/scripts SCRIPTS_DIR=/awips2/GFESuite/ServiceBackup/scripts
CAVE_LAUNCH_SCRIPT=/awips2/cave/cave.sh CAVE_LAUNCH_SCRIPT=/awips2/cave/run.sh
SVCBU_HOST=ec SVCBU_HOST=ec
MSG_SEND_COMMAND=msg_send MSG_SEND_COMMAND=msg_send

2
rpms/utility/scripts/textWS.sh
View file

@ -23,7 +23,7 @@ do
done done
CAVE_DIR=/awips2/cave CAVE_DIR=/awips2/cave
$CAVE_DIR/cave.sh -component textws & $CAVE_DIR/run.sh -component textws &
FXA_HOME=/awips/fxa FXA_HOME=/awips/fxa
. /awips/fxa/readenv.sh . /awips/fxa/readenv.sh