Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-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 6C8DB18AD5 for ; Fri, 26 Feb 2016 01:18:39 +0000 (UTC) Received: (qmail 5748 invoked by uid 500); 26 Feb 2016 01:18:33 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 5704 invoked by uid 500); 26 Feb 2016 01:18:33 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 5694 invoked by uid 99); 26 Feb 2016 01:18:33 -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; Fri, 26 Feb 2016 01:18:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C82D0E8F28; Fri, 26 Feb 2016 01:18:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ywkim@apache.org To: commits@bigtop.apache.org Message-Id: <1f255a349c35429487643637d6f5d70f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: bigtop git commit: BIGTOP-2220 : flume-agent.init incorrectly handles flume.conf Date: Fri, 26 Feb 2016 01:18:32 +0000 (UTC) Repository: bigtop Updated Branches: refs/heads/master 1e9784144 -> 03a3f3494 BIGTOP-2220 : flume-agent.init incorrectly handles flume.conf Signed-off-by: Youngwoo Kim Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/03a3f349 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/03a3f349 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/03a3f349 Branch: refs/heads/master Commit: 03a3f34942cd419f0332e93b376feaf576db42f7 Parents: 1e97841 Author: zenmyo Authored: Thu Jan 7 14:21:11 2016 +0900 Committer: Youngwoo Kim Committed: Fri Feb 26 10:21:37 2016 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/flume/flume-agent.init | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/03a3f349/bigtop-packages/src/common/flume/flume-agent.init ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/flume/flume-agent.init b/bigtop-packages/src/common/flume/flume-agent.init index 1d041a2..ec179c0 100644 --- a/bigtop-packages/src/common/flume/flume-agent.init +++ b/bigtop-packages/src/common/flume/flume-agent.init @@ -197,10 +197,14 @@ checkallstatus() { # Common function to perform user action on all flume conf files # run_functions_on_conf() { + if [ -f ${FLUME_CONF_DIR}/flume.conf ]; then + echo $FLUME_AGENT_NAME + $1 + fi + agent_conf_pattern="${FLUME_CONF_DIR}/flume-.*\.conf" for f in ${FLUME_CONF_DIR}/* do - file_ext=${f##*.} - if [ "$file_ext" = "conf" ]; then + if [ $(echo $f | grep -e ${agent_conf_pattern}) ]; then conf_file=${f%.*} file_name=${conf_file##*/} agent_name=${file_name#*-}