aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzenmyo <tzenmyo@gmail.com>2016-01-07 14:21:11 +0900
committerYoungwoo Kim <ywkim@apache.org>2016-02-26 10:21:37 +0900
commit03a3f34942cd419f0332e93b376feaf576db42f7 (patch)
tree1d568e7ccbddb772adbf46ea5ae26b503831ccbe
parent1e9784144363a90f03c2e4291d8452395b178abc (diff)
downloadbigtop-odpi-03a3f34942cd419f0332e93b376feaf576db42f7.tar.gz
BIGTOP-2220 : flume-agent.init incorrectly handles flume.conf
Signed-off-by: Youngwoo Kim <ywkim@apache.org>
-rw-r--r--bigtop-packages/src/common/flume/flume-agent.init8
1 files changed, 6 insertions, 2 deletions
diff --git a/bigtop-packages/src/common/flume/flume-agent.init b/bigtop-packages/src/common/flume/flume-agent.init
index 1d041a29..ec179c05 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#*-}