Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 051F417C90 for ; Mon, 2 Feb 2015 10:15:56 +0000 (UTC) Received: (qmail 6505 invoked by uid 500); 2 Feb 2015 10:14:58 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 6459 invoked by uid 500); 2 Feb 2015 10:14:58 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 6450 invoked by uid 99); 2 Feb 2015 10:14:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Feb 2015 10:14:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40C7CE035D; Mon, 2 Feb 2015 10:14:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dejanb@apache.org To: commits@activemq.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: activemq git commit: https://issues.apache.org/jira/browse/AMQ-5378 - document shell script configuration and enable using environment variables Date: Mon, 2 Feb 2015 10:14:58 +0000 (UTC) Repository: activemq Updated Branches: refs/heads/trunk 2a0be3b0f -> b35b8e37f https://issues.apache.org/jira/browse/AMQ-5378 - document shell script configuration and enable using environment variables Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b35b8e37 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b35b8e37 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b35b8e37 Branch: refs/heads/trunk Commit: b35b8e37f601bd2842a432f897c0b6b648e5989f Parents: 2a0be3b Author: Dejan Bosanac Authored: Mon Feb 2 11:14:09 2015 +0100 Committer: Dejan Bosanac Committed: Mon Feb 2 11:14:51 2015 +0100 ---------------------------------------------------------------------- assembly/src/release/bin/activemq | 6 ++++++ assembly/src/release/bin/env | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/b35b8e37/assembly/src/release/bin/activemq ---------------------------------------------------------------------- diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq index ce94aef..100e0cd 100755 --- a/assembly/src/release/bin/activemq +++ b/assembly/src/release/bin/activemq @@ -24,6 +24,12 @@ # See also http://activemq.apache.org/activemq-command-line-tools-reference.html # for additional commandline arguments # +# System variables for this script, like ACTIVEMQ_OPTS and ACTIVEMQ_OPTS_MEMORY, +# can be configured in 'env' script located in this directory. +# +# For more information on configuring the script, see http://activemq.apache.org/unix-shell-script.html +# +# # Authors: # Marc Schoechlin http://git-wip-us.apache.org/repos/asf/activemq/blob/b35b8e37/assembly/src/release/bin/env ---------------------------------------------------------------------- diff --git a/assembly/src/release/bin/env b/assembly/src/release/bin/env index 74c5de1..4369293 100644 --- a/assembly/src/release/bin/env +++ b/assembly/src/release/bin/env @@ -16,14 +16,16 @@ # limitations under the License. # ------------------------------------------------------------------------ # Configuration file for running Apache Active MQ as standalone provider -# -# This file overwrites the predefined settings of the sysv init-script # Set jvm memory configuration -ACTIVEMQ_OPTS_MEMORY="-Xms1G -Xmx1G" +if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then + ACTIVEMQ_OPTS_MEMORY="-Xms1G -Xmx1G" +fi -ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config" +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 # Uncomment to enable audit logging #ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS -Dorg.apache.activemq.audit=true" @@ -65,7 +67,9 @@ ACTIVEMQ_SUNJMX_START="$ACTIVEMQ_SUNJMX_START -Dcom.sun.management.jmxremote" ACTIVEMQ_SUNJMX_CONTROL="" # Specify the queue manager URL for using "browse" option of sysv initscript -ACTIVEMQ_QUEUEMANAGERURL="--amqurl tcp://localhost:61616" +if [ -z "$ACTIVEMQ_QUEUEMANAGERURL" ]; then + ACTIVEMQ_QUEUEMANAGERURL="--amqurl tcp://localhost:61616" +fi # Set additional JSE arguments ACTIVEMQ_SSL_OPTS="" @@ -75,7 +79,9 @@ ACTIVEMQ_SSL_OPTS="" # ActiveMQ tries to shutdown the broker by jmx, # after a specified number of seconds send SIGKILL -ACTIVEMQ_KILL_MAXSECONDS=90 +if [ -z "$ACTIVEMQ_KILL_MAXSECONDS" ]; then + ACTIVEMQ_KILL_MAXSECONDS=30 +fi # Active MQ installation dirs # ACTIVEMQ_HOME="/"