Code Review
/
dmaap
/
buscontroller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Include logback.xml in container
[dmaap/buscontroller.git]
/
misc
/
dmaapbc
diff --git
a/misc/dmaapbc
b/misc/dmaapbc
index
6b337db
..
c63fcee
100644
(file)
--- a/
misc/dmaapbc
+++ b/
misc/dmaapbc
@@
-14,6
+14,7
@@
CONTAINER_CONFIG=/opt/app/config/conf
MAIN=org.onap.dmaap.dbcapi.server.Main
MAIN=org.onap.dmaap.dbcapi.server.Main
+
pids() {
set -x
ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
pids() {
set -x
ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
@@
-34,6
+35,14
@@
config() {
fi
cd $APP_ROOT
source $CONTAINER_CONFIG
fi
cd $APP_ROOT
source $CONTAINER_CONFIG
+
+ if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
+ then
+ echo "Creating $APP_ROOT/ok_to_exit so no waiting..."
+ > $APP_ROOT/ok_to_exit
+ else
+ echo "Not creating $APP_ROOT/ok_to_exit"
+ fi
# comment out till certs are available
#if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
#then
# comment out till certs are available
#if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
#then
@@
-80,7
+89,7
@@
start() {
# JVM flags
#old line from Dockerfile...keep for reference only
# JVM flags
#old line from Dockerfile...keep for reference only
- FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties -Dhttps.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+ FLAGS="-cp etc:lib/* -Dlog4j.configuration=etc/log4j.properties -Ddmaapbc.properties=etc/dmaapbc.properties -D
logback.configurationFile=etc/logback.xml -D
https.protocols=TLSv1.2 -Dhttps.cipherSuites=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
#nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
nohup java $FLAGS $MAIN </dev/null &
sleep 5
#nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
nohup java $FLAGS $MAIN </dev/null &
sleep 5
@@
-157,4
+166,11
@@
esac
tail -100 $APP_ROOT/logs/EELF/server.log
echo "------------ tail -100 application.log ---------------"
tail -100 $APP_ROOT/logs/EELF/application.log
tail -100 $APP_ROOT/logs/EELF/server.log
echo "------------ tail -100 application.log ---------------"
tail -100 $APP_ROOT/logs/EELF/application.log
+
+ echo "Check $APP_ROOT/ok_to_exit"
+ while [ ! -f $APP_ROOT/ok_to_exit ]
+ do
+ echo "$APP_ROOT/ok_to_exit does not exist. Sticking around for debugging..."
+ sleep 10
+ done
exit 0
exit 0