QPID-1210: made qpid-run output level configurable

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@681476 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 28 insertions, 13 deletions

diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run
index e9557f75cd..dc23b4b156 100755
--- a/java/common/bin/qpid-run
+++ b/java/common/bin/qpid-run
@@ -37,6 +37,21 @@ die() {
   exit 1
 }
 
+OFF=0
+WARN=1
+INFO=2
+
+if [ -z "$QPID_RUN_LOG" ]; then
+    QPID_RUN_LOG=$OFF
+fi
+
+log() {
+  if [ "$1" -le "$QPID_RUN_LOG" ]; then
+    shift
+    echo "$@"
+  fi
+}
+
 if [ -z $AMQJ_LOGGING_LEVEL ]; then
     export AMQJ_LOGGING_LEVEL=info
 fi
@@ -47,7 +62,7 @@ if [ -z "$QPID_HOME" ]; then
 fi
 
 if [ -z "$QPID_WORK" ]; then
-    echo Setting QPID_WORK to $HOME as default
+    log $INFO Setting QPID_WORK to $HOME as default
     QPID_WORK=$HOME
 fi
 
@@ -65,10 +80,10 @@ SYSTEM_PROPS="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL -DQPID_HOME=$QPID_HOME -D
 #Using X character to avoid probs with empty strings
 if [ -n "$QPID_LOG_PREFIX" ]; then
     if [ "X$QPID_LOG_PREFIX" = "XPID" ]; then
-        echo Using pid in qpid log name prefix
+        log $INFO Using pid in qpid log name prefix
         LOG_PREFIX=" -Dlogprefix=$$"
     else
-        echo Using qpid logprefix property
+        log $INFO Using qpid logprefix property
         LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX"
     fi
     SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_PREFIX}"
@@ -76,16 +91,16 @@ fi
 
 if [ -n "$QPID_LOG_SUFFIX" ]; then
     if [ "X$QPID_LOG_SUFFIX" = "XPID" ]; then
-        echo Using pid in qpid log name suffix
+        log $INFO Using pid in qpid log name suffix
         LOG_SUFFIX=" -Dlogsuffix=$$"
     else
-        echo Using qpig logsuffix property
+        log $INFO Using qpig logsuffix property
         LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX"
     fi
     SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_SUFFIX}"
 fi
 
-echo System Properties set to $SYSTEM_PROPS
+log $INFO System Properties set to $SYSTEM_PROPS
 
 program=$(basename $0)
 sourced=${BASH_SOURCE[0]}
@@ -110,26 +125,26 @@ unset CLASSPATH
 #Use QPID_CLASSPATH if set
 if [ -n "$QPID_CLASSPATH" ]; then
     export CLASSPATH=$QPID_CLASSPATH
-    echo "Using QPID_CLASSPATH" $QPID_CLASSPATH
+    log $INFO "Using QPID_CLASSPATH" $QPID_CLASSPATH
 else
-    echo "Warning: Qpid classpath not set. CLASSPATH must include qpid jars."
+    log $WARN "Warning: Qpid classpath not set. CLASSPATH must include qpid jars."
 fi
 
 #Use QPID_JAVA_GC if set
 if [ -n "$QPID_JAVA_GC" ]; then
     export JAVA_GC=$QPID_JAVA_GC
-    echo "Using QPID_JAVA_GC setting" $QPID_JAVA_GC
+    log $INFO "Using QPID_JAVA_GC setting" $QPID_JAVA_GC
 else
-    echo "Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC" $JAVA_GC
+    log $INFO "Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC" $JAVA_GC
 fi
 
 
 #Use QPID_JAVA_MEM if set
 if [ -n "$QPID_JAVA_MEM" ]; then
     export JAVA_MEM=$QPID_JAVA_MEM
-    echo "Using QPID_JAVA_MEM setting" $QPID_JAVA_MEM
+    log $INFO "Using QPID_JAVA_MEM setting" $QPID_JAVA_MEM
 else
-    echo "Info: QPID_JAVA_MEM not set. Defaulting to JAVA_MEM" $JAVA_MEM
+    log $INFO "Info: QPID_JAVA_MEM not set. Defaulting to JAVA_MEM" $JAVA_MEM
 fi
 
 declare -a RUN_ARGS JAVA_ARGS
@@ -173,7 +188,7 @@ for arg in "${RUN_ARGS[@]}"; do
       ;;
     -run:jpda)
 #USAGE: adds debugging options to the java command, use
-#USAGE: JDPA_TRANSPORT and JPDA_ADDRESS to customize the debugging
+#USAGE: JPDA_TRANSPORT and JPDA_ADDRESS to customize the debugging
 #USAGE: behavior and use JPDA_OPTS to override it entirely
       if [ -z "$JPDA_OPTS" ]; then
         JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT:-dt_socket},address=${JPDA_ADDRESS:-8000},server=y,suspend=n"