X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fresources%2Fconfig%2Fdocker-files%2Fscripts%2Fstart-jboss-server.sh;h=5bbd187b055ee8aa10f02f8028279f902c721b25;hb=7bf306eeb0f6be832558c6edb48b78f5909b2831;hp=52ba27ddca02c3218996693bf00b7a0888aab714;hpb=44f0fdd1cb55517ed57971302b8ae3a74400a691;p=oom.git diff --git a/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh b/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh index 52ba27ddca..5bbd187b05 100755 --- a/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh +++ b/kubernetes/so/resources/config/docker-files/scripts/start-jboss-server.sh @@ -22,10 +22,10 @@ fi #Start the chef-solo if mso-docker.json contains some data. if [ -s /var/berks-cookbooks/${CHEF_REPO_NAME}/environments/mso-docker.json ] then - echo "mso-docker.json has some configuration, replay the recipes." - chef-solo -c /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb -o recipe[mso-config::apih],recipe[mso-config::bpmn],recipe[mso-config::jra] + echo "mso-docker.json has some configuration, replay the recipes." + chef-solo -c /var/berks-cookbooks/${CHEF_REPO_NAME}/solo.rb -o recipe[mso-config::apih],recipe[mso-config::bpmn],recipe[mso-config::jra] else - echo "mso-docker.json is empty, do not replay the recipes." + echo "mso-docker.json is empty, do not replay the recipes." fi JBOSS_PIDFILE=/tmp/jboss-standalone.pid @@ -37,7 +37,7 @@ trap "kill -TERM $JBOSS_PID" INT trap "kill -QUIT $JBOSS_PID" QUIT trap "kill -PIPE $JBOSS_PID" PIPE trap "kill -TERM $JBOSS_PID" TERM -if [ "x$JBOSS_PIDFILE" != "x" ]; then +if [ "$JBOSS_PIDFILE" != "" ]; then echo $JBOSS_PID > $JBOSS_PIDFILE fi # Wait until the background process exits @@ -60,6 +60,6 @@ if [ "$JBOSS_STATUS" -ne 10 ]; then # Wait for a complete shudown wait $JBOSS_PID 2>/dev/null fi -if [ "x$JBOSS_PIDFILE" != "x" ]; then +if [ "$JBOSS_PIDFILE" != "" ]; then grep "$JBOSS_PID" $JBOSS_PIDFILE && rm $JBOSS_PIDFILE fi