jboss-openshift · bdecoste · Oct 17, 2017
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+source $AMQ_HOME/bin/launch/logging.sh
+
 OPENSHIFT_CONFIG_FILE=$AMQ_HOME/conf/openshift-activemq.xml
 CONFIG_FILE=$AMQ_HOME/conf/activemq.xml
 OPENSHIFT_LOGIN_FILE=$AMQ_HOME/conf/openshift-login.config
@@ -31,14 +33,14 @@ function checkViewEndpointsPermission() {
             endpointsAuth="Authorization: Bearer $(cat /var/run/secrets/kubernetes.io/serviceaccount/token)"
             endpointsCode=$(curl -s -o /dev/null -w "%{http_code}" -G -k -H "${endpointsAuth}" ${endpointsUrl})
             if [ "${endpointsCode}" = "200" ]; then
-                echo "Service account has sufficient permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be available."
+                log_info "Service account has sufficient permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be available."
             elif [ "${endpointsCode}" = "403" ]; then
-                >&2 echo "WARNING: Service account has insufficient permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be unavailable. Please refer to the documentation for configuration."
+                log_warning "Service account has insufficient permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be unavailable. Please refer to the documentation for configuration."
             else
-                >&2 echo "WARNING: Service account unable to test permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be unavailable. Please refer to the documentation for configuration."
+                log_warning "Service account unable to test permissions to view endpoints in kubernetes (HTTP ${endpointsCode}). Mesh will be unavailable. Please refer to the documentation for configuration."
             fi
         else
-            >&2 echo "WARNING: Environment variables AMQ_MESH_SERVICE_NAMESPACE and AMQ_MESH_SERVICE_NAME both need to be defined when using AMQ_MESH_DISCOVERY_TYPE=\"kube\". Mesh will be unavailable. Please refer to the documentation for configuration."
+            log_warning "Environment variables AMQ_MESH_SERVICE_NAMESPACE and AMQ_MESH_SERVICE_NAME both need to be defined when using AMQ_MESH_DISCOVERY_TYPE=\"kube\". Mesh will be unavailable. Please refer to the documentation for configuration."
         fi
     fi
 }
@@ -124,7 +126,7 @@ function configureSSL() {
 
     sed -i "s|<!-- ##### SSL_CONTEXT ##### -->|${sslElement}|" "$CONFIG_FILE"
   elif sslPartial ; then
-    echo "WARNING! Partial ssl configuration, the ssl context WILL NOT be configured."
+    log_warning "Partial ssl configuration, the ssl context WILL NOT be configured."
   fi
 }
 

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 
+source $AMQ_HOME/bin/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
 fi
 
 source $AMQ_HOME/bin/configure.sh

@@ -1,8 +1,10 @@
 #!/bin/sh
 
+source $AMQ_HOME/bin/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
 fi
 
 source $AMQ_HOME/bin/configure.sh
@@ -32,7 +34,7 @@ cat <<EOF > $AMQ_HOME/bin/env
 ACTIVEMQ_OPTS="${ACTIVEMQ_OPTS} ${JAVA_OPTS_APPEND}"
 EOF
 
-echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
+log_info "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
 
 # Parameters are
 # - instance directory

@@ -3,6 +3,7 @@
 source "${JBOSS_HOME}/bin/launch/launch-common.sh"
 source "${JBOSS_HOME}/bin/launch/login-modules-common.sh"
 source "${JBOSS_HOME}/bin/launch/management-common.sh"
+source $JBOSS_HOME/bin/launch/logging.sh
 
 function prepareEnv() {
     # please keep these in alphabetical order
@@ -35,8 +36,8 @@ function configure_controller_security() {
     local kieServerControllerPwd=$(find_env "KIE_SERVER_CONTROLLER_PWD" "controller1!")
     ${JBOSS_HOME}/bin/add-user.sh -a --user "${kieServerControllerUser}" --password "${kieServerControllerPwd}" --role "kie-server,rest-all,guest"
     if [ "$?" -ne "0" ]; then
-        echo "Failed to create controller user \"${kieServerControllerUser}\""
-        echo "Exiting..."
+        log_error "Failed to create controller user \"${kieServerControllerUser}\""
+        log_error "Exiting..."
         exit
     fi
 }

@@ -1,9 +1,11 @@
 #!/bin/sh
 # Openshift BPMS Business Central launch script
 
+source $JBOSS_HOME/bin/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
 fi
 
 CONFIG_FILE=$JBOSS_HOME/standalone/configuration/standalone-openshift.xml
@@ -34,11 +36,11 @@ CONFIGURE_SCRIPTS=(
 
 source $JBOSS_HOME/bin/launch/configure.sh
 
-echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
+log_info "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
 
 if [ -n "$CLI_GRACEFUL_SHUTDOWN" ] ; then
   trap "" TERM
-  echo "Using CLI Graceful Shutdown instead of TERM signal"
+  log_info "Using CLI Graceful Shutdown instead of TERM signal"
 fi
 
 exec env M2_HOME=${M2_HOME} $JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} ${JBOSS_BPMSUITE_ARGS}
@@ -2,6 +2,7 @@
 
 source "${JBOSS_HOME}/bin/launch/launch-common.sh"
 source "/opt/rh/rh-maven33/enable"
+source $JBOSS_HOME/bin/launch/logging.sh
 
 function prepareEnv() {
     # please keep these in alphabetical order
@@ -25,8 +26,8 @@ function configure_admin_security() {
     local kieAdminPwd=$(find_env "KIE_ADMIN_PWD" "admin1!")
     ${JBOSS_HOME}/bin/add-user.sh -a --user "${kieAdminUser}" --password "${kieAdminPwd}" --role "kie-server,rest-all,admin,kiemgmt"
     if [ "$?" -ne "0" ]; then
-        echo "Failed to create admin user \"${kieAdminUser}\""
-        echo "Exiting..."
+        log_error "Failed to create admin user \"${kieAdminUser}\""
+        log_error "Exiting..."
         exit
     fi
 }

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 source "${JBOSS_HOME}/bin/launch/launch-common.sh"
+source $JBOSS_HOME/bin/launch/logging.sh
 
 function prepareEnv() {
     # please keep these in alphabetical order
@@ -204,8 +205,8 @@ function configure_server_security() {
     local kieServerPwd=$(find_env "KIE_SERVER_PWD" "execution1!")
     ${JBOSS_HOME}/bin/add-user.sh -a --user "${kieServerUser}" --password "${kieServerPwd}" --role "kie-server,rest-all,guest"
     if [ "$?" -ne "0" ]; then
-        echo "Failed to create execution user \"${kieServerUser}\""
-        echo "Exiting..."
+        log_error "Failed to create execution user \"${kieServerUser}\""
+        log_error "Exiting..."
         exit
     fi
     JBOSS_BPMSUITE_ARGS="${JBOSS_BPMSUITE_ARGS} -Dorg.kie.server.user=${kieServerUser}"
@@ -284,25 +285,25 @@ function configure_server_state() {
         $JBOSS_HOME/bin/launch/kieserver-pull.sh
         ERR=$?
         if [ $ERR -ne 0 ]; then
-            echo "Aborting due to error code $ERR from maven kjar dependency pull"
+            log_error "Aborting due to error code $ERR from maven kjar dependency pull"
             exit $ERR
         fi
 
         # verify all KIE containers (this duplicates s2i process; TODO: short-circuit if possible?)
         $JBOSS_HOME/bin/launch/kieserver-verify.sh
         ERR=$?
         if [ $ERR -ne 0 ]; then
-            echo "Aborting due to error code $ERR from maven kjar verification"
+            log_error "Aborting due to error code $ERR from maven kjar verification"
             exit $ERR
         fi
 
         # create a KIE server state file with all configured containers and properties
         local stateFileInit="org.kie.server.services.impl.storage.file.KieServerStateFileInit"
-        echo "Attempting to generate kie server state file with 'java ${JBOSS_BPMSUITE_ARGS} ${stateFileInit}'"
+        log_info "Attempting to generate kie server state file with 'java ${JBOSS_BPMSUITE_ARGS} ${stateFileInit}'"
         java ${JBOSS_BPMSUITE_ARGS} $(getKieJavaArgs) ${stateFileInit}
         ERR=$?
         if [ $ERR -ne 0 ]; then
-            echo "Aborting due to error code $ERR from kie server state file init"
+            log_error "Aborting due to error code $ERR from kie server state file init"
             exit $ERR
         fi
     fi

@@ -1,6 +1,8 @@
 #!/bin/sh
 # if using vim, do ':set ft=zsh' for easier reading
 
+source $JBOSS_HOME/bin/launch/logging.sh
+
 function getKieJavaArgs() {
     local kieJarDir="${JBOSS_HOME}/standalone/deployments/ROOT.war/WEB-INF/lib"
     local kieClassPath="."
@@ -17,17 +19,17 @@ function setKieEnv() {
     # discover kie server container deployments
     local kieServerContainerDeploymentsFile="${JBOSS_HOME}/kieserver-container-deployments.txt"
     if [ "x${KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE}" != "x" ]; then
-        echo "Encountered EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE: ${KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE}"
+        log_info "Encountered EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE: ${KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE}"
         if [ "x${KIE_SERVER_CONTAINER_DEPLOYMENT}" != "x" ]; then
             KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL="${KIE_SERVER_CONTAINER_DEPLOYMENT}"
             export KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL
-            echo "Setting EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL: ${KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL}"
+            log_info "Setting EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL: ${KIE_SERVER_CONTAINER_DEPLOYMENT_ORIGINAL}"
         fi
         KIE_SERVER_CONTAINER_DEPLOYMENT="${KIE_SERVER_CONTAINER_DEPLOYMENT_OVERRIDE}"
         export KIE_SERVER_CONTAINER_DEPLOYMENT
-        echo "Using overridden EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
+        log_info "Using overridden EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
     elif [ "x${KIE_SERVER_CONTAINER_DEPLOYMENT}" != "x" ]; then
-        echo "Using standard EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
+        log_info "Using standard EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
     elif [ -e ${kieServerContainerDeploymentsFile} ]; then
         local kieServerContainerDeployments=""
         while read kieServerContainerDeployment ; do
@@ -38,7 +40,7 @@ function setKieEnv() {
         kieServerContainerDeployments=$(echo ${kieServerContainerDeployments} | sed "s/\(.*\)|/\1/")
         KIE_SERVER_CONTAINER_DEPLOYMENT="${kieServerContainerDeployments}"
         export KIE_SERVER_CONTAINER_DEPLOYMENT
-        echo "Read ${kieServerContainerDeploymentsFile} into EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
+        log_info "Read ${kieServerContainerDeploymentsFile} into EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT: ${KIE_SERVER_CONTAINER_DEPLOYMENT}"
     fi
 
     # process kie server container deployments
@@ -65,8 +67,8 @@ function setKieEnv() {
         done
     else
         KIE_SERVER_CONTAINER_DEPLOYMENT_COUNT=0
-        echo "Warning: EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT is missing."
-        echo "Example: export KIE_SERVER_CONTAINER_DEPLOYMENT='containerId=groupId:artifactId:version|c2=g2:a2:v2'"
+        log_warning "Warning: EnvVar KIE_SERVER_CONTAINER_DEPLOYMENT is missing."
+        log_warning "Example: export KIE_SERVER_CONTAINER_DEPLOYMENT='containerId=groupId:artifactId:version|c2=g2:a2:v2'"
     fi
 }
 

@@ -1,7 +1,8 @@
 #!/bin/sh
 # if using vim, do ':set ft=zsh' for easier reading
 
-. /opt/rh/rh-maven33/enable
+source /opt/rh/rh-maven33/enable
+source $JBOSS_HOME/bin/launch/logging.sh
 
 LOCAL_SOURCE_DIR=/tmp/src
 
@@ -34,11 +35,11 @@ if [ -d ${DEPLOY_DIR} ]; then
 
             # verify if the current jar is a kjar
             if [ -e "${TEMP_JARS_DIR}/${JAR}/META-INF/kmodule.xml" ]; then
-                echo echo "${DEPLOY_DIR}/${JAR} is a kjar."
+                log_info "${DEPLOY_DIR}/${JAR} is a kjar."
                 KJAR=${JAR}
             fi
 
-            echo "${DEPLOY_DIR}/${JAR} has a pom: Attempting to install"
+            log_info "${DEPLOY_DIR}/${JAR} has a pom: Attempting to install"
             if [ -d ${DEPLOY_DIR}/${JAR} ]; then
                 # jar is an exploded directory; replace with zipped file (for mvn install:install-file below to work)
                 zip -r ${DEPLOY_DIR}/${JAR}.zip ${DEPLOY_DIR}/${JAR}/*
@@ -49,14 +50,14 @@ if [ -d ${DEPLOY_DIR} ]; then
             export MAVEN_OPTS="${MAVEN_OPTS:-$(/opt/run-java/java-default-options)}"
             # Use maven batch mode (CLOUD-579)
             MAVEN_ARGS_INSTALL="-e -DskipTests install:install-file -Dfile=${DEPLOY_DIR}/${JAR} -DpomFile=${POM} -Dpackaging=jar --batch-mode -Djava.net.preferIPv4Stack=true -Popenshift -Dcom.redhat.xpaas.repo.redhatga ${MAVEN_ARGS_APPEND}"
-            echo "Attempting to install jar with 'mvn ${MAVEN_ARGS_INSTALL}'"
-            echo "Using MAVEN_OPTS '${MAVEN_OPTS}'"
-            echo "Using $(mvn --version)"
+            log_info "Attempting to install jar with 'mvn ${MAVEN_ARGS_INSTALL}'"
+            log_info "Using MAVEN_OPTS '${MAVEN_OPTS}'"
+            log_info "Using $(mvn --version)"
             # Execute the maven install of jar and kjar
             mvn $MAVEN_ARGS_INSTALL
             ERR=$?
             if [ $ERR -ne 0 ]; then
-                echo "Aborting due to error code $ERR from Maven build"
+                log_error "Aborting due to error code $ERR from Maven build"
                 # cleanup
                 rm -rf ${TEMP_JARS_DIR}
                 exit $ERR
@@ -66,15 +67,15 @@ if [ -d ${DEPLOY_DIR} ]; then
             if [ "${KJAR}" != "" ]; then
                 pushd $(dirname ${POM}) &> /dev/null
                     # first trigger download of help:evaluate dependencies
-                    echo "Inspecting kjar ${DEPLOY_DIR}/${JAR} for artifact information..."
+                    log_info "Inspecting kjar ${DEPLOY_DIR}/${JAR} for artifact information..."
                     # Add JVM default options
                     export MAVEN_OPTS="${MAVEN_OPTS:-$(/opt/run-java/java-default-options)}"
                     # Use maven batch mode (CLOUD-579)
                     MAVEN_ARGS_EVALUATE="--batch-mode -Djava.net.preferIPv4Stack=true -Popenshift -Dcom.redhat.xpaas.repo.redhatga ${MAVEN_ARGS_APPEND}"
                     mvn help:evaluate -Dexpression=project.artifact ${MAVEN_ARGS_EVALUATE}
                     ERR=$?
                     if [ $ERR -ne 0 ]; then
-                        echo "Aborting due to error code $ERR from Maven artifact discovery"
+                        log_error "Aborting due to error code $ERR from Maven artifact discovery"
                         exit $ERR
                     fi
                     # next use help:evaluate to record the kjar as a kie server container deployment
@@ -83,7 +84,7 @@ if [ -d ${DEPLOY_DIR} ]; then
                     kjarArtifactId="$(mvn help:evaluate -Dexpression=project.artifact.artifactId ${MAVEN_ARGS_EVALUATE} | egrep -v '(^\[.*\])|(Download.*: )')"
                     kjarVersion="$(mvn help:evaluate -Dexpression=project.artifact.version ${MAVEN_ARGS_EVALUATE} | egrep -v '(^\[.*\])|(Download.*: )')"
                     kieServerContainerDeployment="${kjarArtifactId}=${kjarGroupId}:${kjarArtifactId}:${kjarVersion}"
-                    echo "Adding ${kieServerContainerDeployment} to ${kieServerContainerDeploymentsFile}"
+                    log_info "Adding ${kieServerContainerDeployment} to ${kieServerContainerDeploymentsFile}"
                     echo "${kieServerContainerDeployment}" >> ${kieServerContainerDeploymentsFile}
                     chmod --quiet a+rw ${kieServerContainerDeploymentsFile}
                 popd &> /dev/null

@@ -1,7 +1,8 @@
 #!/bin/sh
 # if using vim, do ':set ft=zsh' for easier reading
 
-. /opt/rh/rh-maven33/enable
+source /opt/rh/rh-maven33/enable
+source $JBOSS_HOME/bin/launch/logging.sh
 
 # source the KIE config
 source $JBOSS_HOME/bin/launch/kieserver-env.sh
@@ -40,9 +41,9 @@ if [ "${KIE_SERVER_CONTAINER_DEPLOYMENT}" != "" ]; then
         # Use maven batch mode (CLOUD-579)
         mavenArgsPull="-e -DskipTests dependency:go-offline -f ${pullPomFile} --batch-mode -Djava.net.preferIPv4Stack=true -Popenshift -Dcom.redhat.xpaas.repo.redhatga ${MAVEN_ARGS_APPEND}"
 
-        echo "Attempting to pull dependencies for kjar ${i} with 'mvn ${mavenArgsPull}'"
-        echo "Using MAVEN_OPTS '${MAVEN_OPTS}'"
-        echo "Using $(mvn --version)"
+        log_info "Attempting to pull dependencies for kjar ${i} with 'mvn ${mavenArgsPull}'"
+        log_info "Using MAVEN_OPTS '${MAVEN_OPTS}'"
+        log_info "Using $(mvn --version)"
 
         # Execute the maven pull of dependencies
         mvn ${mavenArgsPull}
@@ -51,7 +52,7 @@ if [ "${KIE_SERVER_CONTAINER_DEPLOYMENT}" != "" ]; then
         rm -f ${pullPomFile}
 
         if [ $ERR -ne 0 ]; then
-            echo "Aborting due to error code $ERR from Maven build"
+            log_error "Aborting due to error code $ERR from Maven build"
             exit $ERR
         fi
     done

@@ -3,6 +3,7 @@
 
 # source the KIE config
 source $JBOSS_HOME/bin/launch/kieserver-env.sh
+source $JBOSS_HOME/bin/launch/logging.sh
 # set the KIE environment
 setKieEnv
 # dump the KIE environment
@@ -18,7 +19,7 @@ function verifyServerContainers() {
             releaseIds="${releaseIds} ${groupId}:${artifactId}:${version}"
         done
         local containerVerifier="org.kie.server.services.impl.KieServerContainerVerifier"
-        echo "Attempting to verify kie server containers with 'java ${containerVerifier} ${releaseIds}'"
+        log_info "Attempting to verify kie server containers with 'java ${containerVerifier} ${releaseIds}'"
         java $(getKieJavaArgs) ${containerVerifier} ${releaseIds}
     fi
 }
@@ -28,7 +29,7 @@ verifyServerContainers
 ERR=$?
 
 if [ $ERR -ne 0 ]; then
-  echo "Aborting due to error code $ERR from kie server container verification"
+  log_error "Aborting due to error code $ERR from kie server container verification"
   exit $ERR
 fi
 

@@ -1,9 +1,11 @@
 #!/bin/sh
 # Openshift BPMS Execution Server launch script
 
+source $JBOSS_HOME/bin/launch/logging.sh
+
 if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     set -x
-    echo "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+    log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
 fi
 
 CONFIG_FILE=$JBOSS_HOME/standalone/configuration/standalone-openshift.xml
@@ -34,11 +36,11 @@ CONFIGURE_SCRIPTS=(
 
 source $JBOSS_HOME/bin/launch/configure.sh
 
-echo "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
+log_info "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
 
 if [ -n "$CLI_GRACEFUL_SHUTDOWN" ] ; then
   trap "" TERM
-  echo "Using CLI Graceful Shutdown instead of TERM signal"
+  log_info "Using CLI Graceful Shutdown instead of TERM signal"
 fi
 
 exec env M2_HOME=${M2_HOME} $JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS} ${JBOSS_BPMSUITE_ARGS}