You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2018/04/10 22:53:04 UTC
activemq git commit: AMQ-6930 provide options to allow stdout/stderr
of activemq process to be redirect to a file using append mode
Repository: activemq
Updated Branches:
refs/heads/activemq-5.15.x 929483906 -> 0036084af
AMQ-6930 provide options to allow stdout/stderr of activemq process to be redirect to a file using append mode
(cherry picked from commit f3a8e882068803a3cdab338d3544b27a7808e0cc)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0036084a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0036084a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0036084a
Branch: refs/heads/activemq-5.15.x
Commit: 0036084af6ec930e91927170bdc6cfc1c81b37ff
Parents: 9294839
Author: Alvin Lin <al...@amazon.com>
Authored: Mon Apr 9 16:53:44 2018 -0700
Committer: Jeff Genender <jg...@savoirtech.com>
Committed: Tue Apr 10 16:52:47 2018 -0600
----------------------------------------------------------------------
assembly/src/release/bin/activemq | 2 +-
assembly/src/release/bin/env | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0036084a/assembly/src/release/bin/activemq
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 1468aa9..0edc908 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -334,7 +334,7 @@ invokeJar(){
-Dactivemq.conf=\"${ACTIVEMQ_CONF}\" \
-Dactivemq.data=\"${ACTIVEMQ_DATA}\" \
$ACTIVEMQ_CYGWIN \
- -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >/dev/null 2>&1 &
+ -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS >> $ACTIVEMQ_OUT 2>&1 &
RET=\"\$?\"; APID=\"\$!\";
echo \$APID > "${PIDFILE}";
echo \"INFO: pidfile created : '${PIDFILE}' (pid '\$APID')\";exit \$RET" $DOIT_POSTFIX
http://git-wip-us.apache.org/repos/asf/activemq/blob/0036084a/assembly/src/release/bin/env
----------------------------------------------------------------------
diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env
index 2b8431d..400e9b8 100644
--- a/assembly/src/release/bin/env
+++ b/assembly/src/release/bin/env
@@ -19,7 +19,7 @@
# Configuration file for running Apache Active MQ as standalone provider.
#
# This file overwrites the predefined settings of the sysv init-script.
-# You can also use alternate location for default settings -
+# You can also use alternate location for default settings -
# invoke the init-script without a argument an review help section "Configuration of this script"
# /etc/default/activemq <activemq user home>/.activemqrc <activemq installation dir>/bin/env
@@ -37,6 +37,10 @@ if [ -z "$ACTIVEMQ_OPTS" ] ; then
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
fi
+if [ -z "$ACTIVEMQ_OUT" ]; then
+ ACTIVEMQ_OUT="/dev/null"
+fi
+
# Uncomment to enable audit logging
#ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true"