From commits-return-51019-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Tue Apr 10 21:49:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id ECD2D18064C for ; Tue, 10 Apr 2018 21:49:01 +0200 (CEST) Received: (qmail 21833 invoked by uid 500); 10 Apr 2018 19:49:01 -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 21824 invoked by uid 99); 10 Apr 2018 19:49:01 -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; Tue, 10 Apr 2018 19:49:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01042E0910; Tue, 10 Apr 2018 19:49:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: artnaseef@apache.org To: commits@activemq.apache.org Date: Tue, 10 Apr 2018 19:49:00 -0000 Message-Id: <408ad0fdb22b415891d4dc7c2f53f89b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Apr 9 16:53:44 2018 -0700 Committer: artnaseef 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 /.activemqrc /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"