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.

Sign up for GitHub

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

Jump to bottom

fix(docker-jans): add missing logs due to improper configuration #3994

Merged
merged 2 commits into from
Feb 28, 2023
Merged

fix(docker-jans): add missing logs due to improper configuration #3994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d96e3
fix(docker-jans-scim): set default root log level to info
iromli Feb 27, 2023
abf5731
fix(docker-jans-config-api): overlapping log target between config-ap…
iromli Feb 27, 2023
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: 4 additions & 4 deletions docker-jans-config-api/plugins/admin-ui/log4j2-adminui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<Configuration packages="io.jans.log">
<Properties>
<Property name="log.console.prefix" value="config-api" />
<Property name="log.console.prefix.admin-ui" value="config-api" />
</Properties>
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<Console name="AdminUI_Console" target="SYSTEM_OUT">
<PatternLayout pattern="$log_prefix%d{dd-MM HH:mm:ss.SSS} %-5p %C{4} %F:%L- %m%n" />
</Console>

Expand Down Expand Up @@ -34,11 +34,11 @@

<Loggers>
<Logger name="io.jans.ca.plugin.adminui.rest.logging" level="$admin_ui_audit_log_level" additivity="false">
<Property name="log.console.group">/admin-ui-audit</Property>
<Property name="log.console.group.admin-ui">/admin-ui-audit</Property>
<AppenderRef ref="$admin_ui_audit_log_target" />
</Logger>
<Logger name="io.jans.ca.plugin.adminui" level="$admin_ui_log_level" additivity="false">
<Property name="log.console.group">/admin-ui</Property>
<Property name="log.console.group.admin-ui">/admin-ui</Property>
<AppenderRef ref="$admin_ui_log_target" />
</Logger>
</Loggers>
Expand Down
4 changes: 2 additions & 2 deletions docker-jans-config-api/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,12 @@ def configure_admin_ui_logging():
continue

if value == "STDOUT":
config[key] = "Console"
config[key] = "AdminUI_Console"
else:
config[key] = file_aliases[key]

if as_boolean(custom_config.get("enable_stdout_log_prefix")):
config["log_prefix"] = "${sys:log.console.prefix}%X{log.console.group} - "
config["log_prefix"] = "${sys:log.console.prefix.admin-ui}%X{log.console.group.admin-ui} - "

with open("/app/plugins/admin-ui/log4j2-adminui.xml") as f:
txt = f.read()
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/jetty/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<AppenderRef ref="$script_log_target" />
</logger>

<Root level="ERROR">
<Root level="INFO">
<AppenderRef ref="STDOUT" />
</Root>
</Loggers>
Expand Down