Modify for k8s deployment compatibility

[dmaap/buscontroller.git] / misc / dmaapbc

diff --git a/misc/dmaapbc b/misc/dmaapbc
index 3d19f88..6b337db 100644 (file)
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -15,9 +15,9 @@ MAIN=org.onap.dmaap.dbcapi.server.Main
 
 
 pids() {
-       #set -x
+       set -x
        ps -ef | grep java | grep $MAIN | sed -e 's/[^ ]* *//' -e 's/ .*//'
-       #set +x
+       set +x
 }
 
 config() {
@@ -34,12 +34,13 @@ config() {
        fi
        cd $APP_ROOT
        source $CONTAINER_CONFIG
-       if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
-       then
-               echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
-               exit 1
-       fi
-       $APP_ROOT/misc/cert-client-init.sh
+       # comment out till certs are available
+       #if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
+       #then
+       #       echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
+       #       exit 1
+       #fi
+       #$APP_ROOT/misc/cert-client-init.sh
        . misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
     . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
        set +x
@@ -80,22 +81,10 @@ start() {
        # 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"
-       nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
+       #nohup java $FLAGS $MAIN </dev/null >/dev/null 2>&1 &
+       nohup java $FLAGS $MAIN </dev/null  &
        sleep 5
        PIDS=`pids`
-       if [ "$PIDS" = "" ]
-       then
-               echo $COMPONENT startup failed
-               ls -l $APP_ROOT/logs/EELF
-               echo "------------ error.log ---------------"
-               cat $APP_ROOT/logs/EELF/error.log
-               echo "------------ server.log ---------------"
-               cat $APP_ROOT/logs/EELF/server.log
-               echo "------------ tail -100 application.log ---------------"
-               tail -100 $APP_ROOT/logs/EELF/application.log
-       else
-               echo $COMPONENT started
-       fi
        set +x
 }
 
@@ -161,4 +150,11 @@ case "$1" in
        exit 1
        ;;
 esac
+               ls -l $APP_ROOT/logs/EELF
+               echo "------------ tail -100 error.log ---------------"
+               tail -100  $APP_ROOT/logs/EELF/error.log
+               echo "------------ tail -100 server.log ---------------"
+               tail -100  $APP_ROOT/logs/EELF/server.log
+               echo "------------ tail -100 application.log ---------------"
+               tail -100 $APP_ROOT/logs/EELF/application.log
 exit 0