Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CLOUD-3941] - Logger configurations in OCP #254

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ function configure_json_logging() {
getConfigurationMode "##CONSOLE-FORMATTER##" "configureMode"
if [ "${configureMode}" = "xml" ]; then
configureByMarkers
configurePatternFormatterByMarkers
elif [ "${configureMode}" = "cli" ]; then
configureByCLI
configurePatternFormatterByCLI >> ${CLI_SCRIPT_FILE}
else
sed -i 's|##CONSOLE-FORMATTER##|COLOR-PATTERN|' $LOGGING_FILE
fi
Expand Down Expand Up @@ -66,3 +68,29 @@ EOF

echo "$result"
}

function configurePatternFormatterByMarkers(){
local pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"
if [ "x${LOGGER_PATTERN}" != "x" ]; then
pattern=${LOGGER_PATTERN}
fi
sed -i 's|##PATTERN_FORMATTER##|${PATTERN_FORMATTER}|' $CONFIG_FILE
sed -i 's|##PATTERN_FORMATTER##|${PATTERN_FORMATTER}|' $LOGGING_FILE
}


function configurePatternFormatterByCLI() {
local pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"
local result=""

if [ "x${LOGGER_PATTERN}" != "x" ]; then
pattern=${LOGGER_PATTERN}
fi

read -r -d '' result <<EOF
if (outcome == success) of /subsystem=logging/console-handler=CONSOLE:read-resource
/subsystem=logging/console-handler=CONSOLE:write-attribute(name="formatter", value=${pattern})
end-if
EOF
echo "$result"
}