Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13B2A18D5D for ; Mon, 30 Nov 2015 17:48:11 +0000 (UTC) Received: (qmail 78236 invoked by uid 500); 30 Nov 2015 17:48:11 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 78215 invoked by uid 500); 30 Nov 2015 17:48:10 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 78206 invoked by uid 99); 30 Nov 2015 17:48:10 -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, 30 Nov 2015 17:48:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CCA7EE0A1A; Mon, 30 Nov 2015 17:48:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.apache.org Message-Id: <87673a5639604b929d95d0bc74705991@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: aurora-packaging git commit: AURORA-1512: Aurora rpm missing std output switch Date: Mon, 30 Nov 2015 17:48:10 +0000 (UTC) Repository: aurora-packaging Updated Branches: refs/heads/0.10.x c24040076 -> e4986dd32 AURORA-1512: Aurora rpm missing std output switch Bugs closed: AURORA-1512 Reviewed at https://reviews.apache.org/r/38975/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/e4986dd3 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/e4986dd3 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/e4986dd3 Branch: refs/heads/0.10.x Commit: e4986dd32198ad9138db8c89d10070e618397ad9 Parents: c240400 Author: Jake Farrell Authored: Mon Nov 30 09:41:41 2015 -0800 Committer: Bill Farner Committed: Mon Nov 30 09:41:41 2015 -0800 ---------------------------------------------------------------------- specs/rpm/SOURCES/aurora.init.sh | 5 +++-- specs/rpm/SOURCES/thermos-observer.init.sh | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e4986dd3/specs/rpm/SOURCES/aurora.init.sh ---------------------------------------------------------------------- diff --git a/specs/rpm/SOURCES/aurora.init.sh b/specs/rpm/SOURCES/aurora.init.sh index ac4c438..a0e3dc8 100644 --- a/specs/rpm/SOURCES/aurora.init.sh +++ b/specs/rpm/SOURCES/aurora.init.sh @@ -41,7 +41,8 @@ prog="aurora" logdir="/var/log/aurora" lockfile="/var/run/aurora.lock" pid_file="/var/run/aurora.pid" -stderr_log="${logdir}/aurora.log" +stdout_log="${logdir}/aurora.log" +stderr_log="${logdir}/aurora-error.log" # Get a sane screen width [ -z "${COLUMNS:-}" ] && COLUMNS=80 @@ -126,7 +127,7 @@ start() { [ -x ${exec} ] || exit 5 [ -f ${config} ] || exit 6 echo -n $"Starting $prog: " - start_daemon daemonize -u ${aurora_user} -e ${stderr_log} -p ${pid_file} ${exec} + start_daemon daemonize -u ${aurora_user} -o ${stdout_log} -e ${stderr_log} -p ${pid_file} ${exec} retval=$? [ $retval -eq 0 ] && (echo_success; touch $lockfile) || echo_failure echo http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/e4986dd3/specs/rpm/SOURCES/thermos-observer.init.sh ---------------------------------------------------------------------- diff --git a/specs/rpm/SOURCES/thermos-observer.init.sh b/specs/rpm/SOURCES/thermos-observer.init.sh index 65a2452..38eea53 100644 --- a/specs/rpm/SOURCES/thermos-observer.init.sh +++ b/specs/rpm/SOURCES/thermos-observer.init.sh @@ -38,8 +38,8 @@ prog="thermos-observer" logdir="/var/log/thermos" lockfile="/var/run/thermos-observer.lock" pid_file="/var/run/thermos-observer.pid" - -stderr_log="${logdir}/observer.log" +stdout_log="${logdir}/observer.log" +stderr_log="${logdir}/observer-error.log" # Get a sane screen width [ -z "${COLUMNS:-}" ] && COLUMNS=80 @@ -124,7 +124,7 @@ start() { [ -x ${exec} ] || exit 5 [ -f ${config} ] || exit 6 echo -n $"Starting $prog: " - start_daemon daemonize -e ${stderr_log} -p ${pid_file} ${exec} + start_daemon daemonize -o ${stdout_log} -e ${stderr_log} -p ${pid_file} ${exec} retval=$? [ $retval -eq 0 ] && (echo_success; touch $lockfile) || echo_failure echo