From 5b090176a14d3e68af01b920a0f4d041f56e5fa5 Mon Sep 17 00:00:00 2001 From: Husaam Mehdi Date: Thu, 12 Jun 2025 09:04:46 +0000 Subject: [PATCH] logmngr: Fix shadow variable names in lib --- logmngr/files/lib/logmngr/fluent-bit.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/logmngr/files/lib/logmngr/fluent-bit.sh b/logmngr/files/lib/logmngr/fluent-bit.sh index c2dff9004..f7c40a635 100644 --- a/logmngr/files/lib/logmngr/fluent-bit.sh +++ b/logmngr/files/lib/logmngr/fluent-bit.sh @@ -5,7 +5,7 @@ CONF_FILE=/etc/fluent-bit/fluent-bit.conf TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf -CONF_DIR=/etc/fluent-bit/conf.d +FLUENT_BIT_CONF_DIR=/etc/fluent-bit/conf.d append_conf() { echo "$*" >> ${TMP_CONF_FILE} @@ -15,12 +15,12 @@ create_config_file() { mkdir -p /tmp/fluent-bit rm -f ${TMP_CONF_FILE} touch ${TMP_CONF_FILE} - # include all files placed in CONF_DIR directory + # include all files placed in FLUENT_BIT_CONF_DIR directory # fluent-bit does not support using directory in include directive # also, if no file is found then fluent-bit aborts - # so only add include if any file is present in the CONF_DIR - if [ -d "$CONF_DIR" ] && [ "$(ls -A "$CONF_DIR")" ]; then - echo "@INCLUDE ${CONF_DIR}/*" >> ${TMP_CONF_FILE} + # so only add include if any file is present in the FLUENT_BIT_CONF_DIR + if [ -d "$FLUENT_BIT_CONF_DIR" ] && [ "$(ls -A "$FLUENT_BIT_CONF_DIR")" ]; then + echo "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*" >> ${TMP_CONF_FILE} fi echo "" >> ${TMP_CONF_FILE} }