From f0d96e3facca747a8c87bdf6a4e005faa7507bda Mon Sep 17 00:00:00 2001 From: iromli Date: Tue, 28 Feb 2023 01:20:34 +0700 Subject: [PATCH 1/2] fix(docker-jans-scim): set default root log level to info --- docker-jans-scim/jetty/log4j2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-jans-scim/jetty/log4j2.xml b/docker-jans-scim/jetty/log4j2.xml index b1c701abbed..c24f4c4a82d 100644 --- a/docker-jans-scim/jetty/log4j2.xml +++ b/docker-jans-scim/jetty/log4j2.xml @@ -118,7 +118,7 @@ - + From abf573129727b51b216e6b8f1c76aaba9624c686 Mon Sep 17 00:00:00 2001 From: iromli Date: Tue, 28 Feb 2023 01:21:16 +0700 Subject: [PATCH 2/2] fix(docker-jans-config-api): overlapping log target between config-api and admin-ui plugin --- .../plugins/admin-ui/log4j2-adminui.xml | 8 ++++---- docker-jans-config-api/scripts/bootstrap.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-jans-config-api/plugins/admin-ui/log4j2-adminui.xml b/docker-jans-config-api/plugins/admin-ui/log4j2-adminui.xml index b5fbad21ce9..d296311e80b 100644 --- a/docker-jans-config-api/plugins/admin-ui/log4j2-adminui.xml +++ b/docker-jans-config-api/plugins/admin-ui/log4j2-adminui.xml @@ -2,10 +2,10 @@ - + - + @@ -34,11 +34,11 @@ - /admin-ui-audit + /admin-ui-audit - /admin-ui + /admin-ui diff --git a/docker-jans-config-api/scripts/bootstrap.py b/docker-jans-config-api/scripts/bootstrap.py index 9ee64f8b4db..da56156c631 100644 --- a/docker-jans-config-api/scripts/bootstrap.py +++ b/docker-jans-config-api/scripts/bootstrap.py @@ -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()