Repository: bigtop Updated Branches: refs/heads/BIGTOP-2320 77a1f3cb8 -> 18370b22d (forced update)
BIGTOP-2220 : flume-agent.init incorrectly handles flume.conf Signed-off-by: Youngwoo Kim <[email protected]> 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/BIGTOP-2320 Commit: 03a3f34942cd419f0332e93b376feaf576db42f7 Parents: 1e97841 Author: zenmyo <[email protected]> Authored: Thu Jan 7 14:21:11 2016 +0900 Committer: Youngwoo Kim <[email protected]> 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#*-}
