You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ar...@apache.org on 2018/04/10 19:49:00 UTC
[1/2] 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/master 84126d8a7 -> 246899bb2
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/73d90b1b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/73d90b1b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/73d90b1b
Branch: refs/heads/master
Commit: 73d90b1b4782dfbdf7803dde50cf355c9171137b
Parents: 84126d8
Author: Alvin Lin <al...@amazon.com>
Authored: Mon Apr 9 16:53:44 2018 -0700
Committer: artnaseef <ar...@apache.org>
Committed: Tue Apr 10 12:12:27 2018 -0700
----------------------------------------------------------------------
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/73d90b1b/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/73d90b1b/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"
[2/2] activemq git commit: AMQ-6930 add test case
Posted by ar...@apache.org.
AMQ-6930 add test case
(cherry picked from commit 6bb56decf881328f5595692ca17c1899f7f86a7b)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/246899bb
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/246899bb
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/246899bb
Branch: refs/heads/master
Commit: 246899bb268345bd1b6c7aab484ebb28005bf6b0
Parents: 73d90b1
Author: Alvin Lin <al...@amazon.com>
Authored: Mon Apr 9 19:04:55 2018 -0700
Committer: artnaseef <ar...@apache.org>
Committed: Tue Apr 10 12:13:36 2018 -0700
----------------------------------------------------------------------
assembly/src/test/scripts/init-script-testsuite | 36 +++++++++++++-------
1 file changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/246899bb/assembly/src/test/scripts/init-script-testsuite
----------------------------------------------------------------------
diff --git a/assembly/src/test/scripts/init-script-testsuite b/assembly/src/test/scripts/init-script-testsuite
index 9b7bafc..81ee22f 100755
--- a/assembly/src/test/scripts/init-script-testsuite
+++ b/assembly/src/test/scripts/init-script-testsuite
@@ -19,7 +19,7 @@
# This script tests the activemq init script
#
# Authors:
-# Marc Schoechlin <ms...@256bit.org>
+# Marc Schoechlin <ms...@256bit.org>
STATUS_OVERVIEW=""
OVERALL_STATUS="0"
@@ -97,7 +97,7 @@ echo "Setting HOME to $TESTDIR"
export HOME="$TESTDIR"
case "`uname`" in
- CYGWIN*)
+ CYGWIN*)
echo "Set init script"
SCRIPT="$PWD/activemq"
CONFIG="$HOME/.activemqrc"
@@ -124,17 +124,17 @@ sleep 2
assert ${STRATEGY} successful "${SCRIPT} stop"
assert ${STRATEGY} failed "${SCRIPT}"
assert ${STRATEGY} failed "${SCRIPT} status"
-assert ${STRATEGY} successful "${SCRIPT} browse|grep -q 'Activemq is not running.'"
-assert ${STRATEGY} successful "${SCRIPT} browse FOOBAR111111111 2>&1|grep -q 'Activemq is not running.'"
-assert ${STRATEGY} successful "${SCRIPT} browse --amqurl tcp://localhost:11111 FOOOOO 2>&1|grep -q 'java.net.ConnectException'"
+assert ${STRATEGY} successful "${SCRIPT} browse|grep -q 'No JMS destination specified.'"
+assert ${STRATEGY} successful "${SCRIPT} browse FOOBAR111111111 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} browse --amqurl tcp://localhost:11111 FOOOOO 2>&1|grep -q 'Broker not available at:'"
assert ${STRATEGY} successful "${SCRIPT} encrypt --password TESTPASSWORD --input FOOBAR|grep -q 'Encrypted text: '"
assert ${STRATEGY} successful "${SCRIPT} decrypt --input 'BkiT42A0CZfL1SanJIgxvQ==' --password asdasdasdasd|grep -q 'Decrypted text:'"
-assert ${STRATEGY} successful "${SCRIPT} bstat 2>&1|grep -q 'Activemq is not running.'"
-assert ${STRATEGY} successful "${SCRIPT} bstat --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'java.net.ConnectException'"
-assert ${STRATEGY} successful "${SCRIPT} dstat 2>&1|grep -q 'Activemq is not running.'"
-assert ${STRATEGY} successful "${SCRIPT} dstat --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'java.net.ConnectException'"
-assert ${STRATEGY} successful "${SCRIPT} query 2>&1|grep -q 'Activemq is not running.'"
-assert ${STRATEGY} successful "${SCRIPT} query --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'java.net.ConnectException'"
+assert ${STRATEGY} successful "${SCRIPT} bstat 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} bstat --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} dstat 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} dstat --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} query 2>&1|grep -q 'Broker not available at:'"
+assert ${STRATEGY} successful "${SCRIPT} query --jmxurl service:jmx:rmi:///jndi/rmi://127.0.0.1:11098/jmxrmi --jmxuser controlRole --jmxpassword abcd1234 2>&1|grep -q 'Broker not available at:'"
assert ${STRATEGY} successful "${SCRIPT} restart"
assert ${STRATEGY} successful "${SCRIPT} stop"
@@ -170,8 +170,18 @@ assert ${STRATEGY} successful "${SCRIPT} query|grep brokerName"
# assert ${STRATEGY} successful "${SCRIPT} create"
# assert ${STRATEGY} successful "${SCRIPT} export"
-echo
-echo
+#ActiveMQ start with custom ACTIVEMQ_OUT
+TEST_ACTIVEMQ_OUT=$TESTDIR/activemq.out
+export ACTIVEMQ_OUT=$TEST_ACTIVEMQ_OUT
+assert ${STRATEGY} successful "${SCRIPT} restart && test -f $TEST_ACTIVEMQ_OUT"
+assert ${STRATEGY} successful "${SCRIPT} stop"
+rm $TEST_ACTIVEMQ_OUT
+unset ACTIVEMQ_OUT
+assert ${STRATEGY} successful "${SCRIPT} restart && test ! -f $TEST_ACTIVEMQ_OUT"
+assert ${STRATEGY} successful "${SCRIPT} stop"
+
+echo
+echo
trap "" INT TERM
finalize