svn commit: r466045 - /incubator/qpid/trunk/qpid/java/common/bin/qpid-run

[ma...@apache.org]

Author: marnie
Date: Fri Oct 20 02:47:41 2006
New Revision: 466045

URL: http://svn.apache.org/viewvc?view=rev&rev=466045
Log:
Added log prefix/suffix handling as per QPID-13

Modified:
    incubator/qpid/trunk/qpid/java/common/bin/qpid-run

Modified: incubator/qpid/trunk/qpid/java/common/bin/qpid-run
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/bin/qpid-run?view=diff&rev=466045&r1=466044&r2=466045
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/bin/qpid-run (original)
+++ incubator/qpid/trunk/qpid/java/common/bin/qpid-run Fri Oct 20 02:47:41 2006
@@ -41,6 +41,42 @@
     QPID_WORK=$HOME
 fi
 
+if $cygwin; then
+  QPID_HOME=$(cygpath -w $QPID_HOME)
+  QPID_WORK=$(cygpath -w $QPID_WORK)
+fi
+
+#Set the default system properties that we'll use now that they have
+#all been initialised
+SYSTEM_PROPS="-Damqj.logging.level=$AMQJ_LOGGING_LEVEL -DQPID_HOME=$QPID_HOME -DQPID_WORK=$QPID_WORK"
+
+#If logprefix or logsuffix set to use PID make that happen
+#Otherwise just pass the value through for these props
+#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_PREFIX=" -Dlogprefix=$$"
+    else
+        echo Using qpid logprefix property
+        LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX"
+    fi
+    SYSTEM_PROPS+=$LOG_PREFIX
+fi
+
+if [ -n "$QPID_LOG_SUFFIX" ]; then
+    if [ "X$QPID_LOG_SUFFIX" = "XPID" ]; then
+        echo Using pid in qpid log name suffix
+        LOG_SUFFIX=" -Dlogsuffix=$$"
+    else
+        echo Using qpig logsuffix property
+        LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX"
+    fi
+    SYSTEM_PROPS+=$LOG_SUFFIX
+fi
+
+echo System Properties set to $SYSTEM_PROPS
+
 program=$(basename $0)
 sourced=${BASH_SOURCE[0]}
 if [[ -z ${sourced:-''} ]]; then
@@ -175,12 +211,10 @@
 done
 
 if $cygwin; then
-  QPID_HOME=$(cygpath -w $QPID_HOME)
   CLASSPATH=$(cygpath -w -p $CLASSPATH)
-  QPID_WORK=$(cygpath -w $QPID_WORK)
   JAVA=$(cygpath -u $JAVA)
 fi
 
-COMMAND=($JAVA $JAVA_VM $JAVA_MEM -Damqj.logging.level=$AMQJ_LOGGING_LEVEL -DQPID_HOME=$QPID_HOME -DQPID_WORK=$QPID_WORK $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
+COMMAND=($JAVA $JAVA_VM $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}")
 
 DISPATCH