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

Forcelly set QUARKUS_LOG_CONSOLE_JSON to false if the trait is not provided (GH issue #2539) #2540

Merged
merged 1 commit into from
Aug 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/trait/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,12 @@ func (l loggingTrait) Apply(environment *Environment) error {
if util.IsTrue(l.JsonPrettyPrint) {
envvar.SetVal(&environment.EnvVars, envVarQuarkusLogConsoleJsonPrettyPrint, True)
}
} else if util.IsNilOrTrue(l.Color) {
envvar.SetVal(&environment.EnvVars, envVarQuarkusLogConsoleColor, True)
} else {
envvar.SetVal(&environment.EnvVars, envVarQuarkusLogConsoleJson, False)
astefanutti marked this conversation as resolved.
Show resolved Hide resolved

if util.IsNilOrTrue(l.Color) {
envvar.SetVal(&environment.EnvVars, envVarQuarkusLogConsoleColor, True)
}
}

return nil
Expand Down
1 change: 1 addition & 0 deletions pkg/trait/trait_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import (

// True --
const True = "true"
const False = "false"

var (
basePath = "/etc/camel"
Expand Down