From c3f980293c330d9103906bef1d15bb5b349e8fcc Mon Sep 17 00:00:00 2001
From: Yuriy Movchan <Yuriy.Movchan@gmail.com>
Date: Tue, 31 Jan 2023 21:28:14 +0300
Subject: [PATCH] feat: add more loggers

---
 .../server/src/main/resources/log4j2.xml      |  4 +-
 .../server/src/main/resources/log4j2.xml      | 62 +++++++++++++++----
 2 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/jans-auth-server/server/src/main/resources/log4j2.xml b/jans-auth-server/server/src/main/resources/log4j2.xml
index be02619bd60..1678d63bf88 100644
--- a/jans-auth-server/server/src/main/resources/log4j2.xml
+++ b/jans-auth-server/server/src/main/resources/log4j2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Configuration packages="org.gluu.log">
+<Configuration packages="io.jans.log">
 	<Appenders>
 		<Console name="STDOUT" target="SYSTEM_OUT">
 			<PatternLayout pattern="%d %-5p [%t] [%C{6}] (%F:%L) - %m%n" />
@@ -97,7 +97,7 @@
 		<!-- ############### Hibernate logging ################# -->
 		<Logger name="org.hibernate" level="error" />
 
-		<Logger name="org.gluu.jans-auth.audit.debug" level="${log4j.default.log.level}" additivity="false">
+		<Logger name="io.jans.as.server.audit.debug" level="${log4j.default.log.level}" additivity="false">
 			<AppenderRef ref="JANS_AUTH_HTTP_REQUEST_RESPONSE_FILE" />
 		</Logger>
 
diff --git a/jans-fido2/server/src/main/resources/log4j2.xml b/jans-fido2/server/src/main/resources/log4j2.xml
index 144d998c690..2fe67cf68b0 100644
--- a/jans-fido2/server/src/main/resources/log4j2.xml
+++ b/jans-fido2/server/src/main/resources/log4j2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Configuration packages="org.gluu.log">
+<Configuration packages="io.jans.log">
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{dd-MM HH:mm:ss.SSS} %-5p [%t] [%C{6}] (%F:%L) - %m%n" />
@@ -17,7 +17,7 @@
             <DefaultRolloverStrategy max="15" />
         </RollingFile>
 
-		<RollingFile name="PERSISTENCE_FILE" fileName="${sys:log.base}/logs/fido2_persistence.log" filePattern="${sys:log.base}/logs/fido2_persistence-%d{yyyy-MM-dd}-%i.log">
+		<RollingFile name="FIDO2_PERSISTENCE_FILE" fileName="${sys:log.base}/logs/fido2_persistence.log" filePattern="${sys:log.base}/logs/fido2_persistence-%d{yyyy-MM-dd}-%i.log">
             <PatternLayout pattern="%d{dd-MM HH:mm:ss.SSS} %-5p [%t] [%C{6}] (%F:%L) - %m%n" />
 
 			<Policies>
@@ -26,28 +26,68 @@
 			</Policies>
 			<DefaultRolloverStrategy max="15" />
 		</RollingFile>
+
+		<RollingFile name="FIDO2_PERSISTENCE_DURATION_FILE" fileName="${sys:log.base}/logs/fido2_persistence_duration.log" filePattern="${sys:log.base}/logs/fido2_persistence_duration-%d{yyyy-MM-dd}-%i.log">
+			<PatternLayout pattern="%d %-5p [%t] %X{X-Correlation-Id} [%C{6}] (%F:%L) - %m%n" />
+
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
+				<SizeBasedTriggeringPolicy size="250 MB" />
+			</Policies>
+			<DefaultRolloverStrategy max="30" />
+		</RollingFile>
+
+		<RollingFile name="FIDO2_SCRIPT_LOG_FILE" fileName="${sys:log.base}/logs/fido2_script.log" filePattern="${sys:log.base}/logs/fido2_script-%d{yyyy-MM-dd}-%i.log">
+			<PatternLayout pattern="%d %-5p [%t] %X{X-Correlation-Id} [%C{6}] (%F:%L) - %m%n" />
+
+			<Policies>
+				<TimeBasedTriggeringPolicy interval="1" modulate="true" />
+				<SizeBasedTriggeringPolicy size="250 MB" />
+			</Policies>
+			<DefaultRolloverStrategy max="30" />
+		</RollingFile>
     </Appenders>
 
     <Loggers>
 		<!-- ############### Gluu ################# -->
-		<Logger name="org.gluu" level="${log4j.default.log.level}" />
+		<Logger name=io.jans" level="${log4j.default.log.level}" />
 
-        <Logger name="org.gluu.site.ldap" level="${log4j.default.log.level}" additivity="false">
-			<AppenderRef ref="PERSISTENCE_FILE" />
-		</Logger>
-
-		<Logger name="org.gluu.persist" level="${log4j.default.log.level}" additivity="false">
-			<AppenderRef ref="PERSISTENCE_FILE" />
+		<Logger name="io.jans.orm" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_PERSISTENCE_FILE" />
 		</Logger>
 
 		<Logger name="com.unboundid.ldap.sdk.LDAPConnection" level="${log4j.default.log.level}" additivity="false">
-			<AppenderRef ref="PERSISTENCE_FILE" />
+			<AppenderRef ref="FIDO2_PERSISTENCE_FILE" />
 		</Logger>
 
 		<logger name="com.couchbase.client" level="${log4j.default.log.level}" additivity="false">
-			<AppenderRef ref="PERSISTENCE_FILE" />
+			<AppenderRef ref="FIDO2_PERSISTENCE_FILE" />
 		</logger>
 
+		<Logger name="io.jans.orm.ldap.operation.watch" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_PERSISTENCE_DURATION_FILE" />
+		</Logger>
+
+		<Logger name="io.jans.orm.couchbase.operation.watch" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_PERSISTENCE_DURATION_FILE" />
+		</Logger>
+
+		<Logger name="io.jans.orm.watch" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_PERSISTENCE_DURATION_FILE" />
+		</Logger>
+
+		<Logger name="io.jans.service.PythonService" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_SCRIPT_LOG_FILE" />
+		</Logger>
+
+		<Logger name="io.jans.service.custom.script" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_SCRIPT_LOG_FILE" />
+		</Logger>
+
+		<Logger name="io.jans.fido2.service.shared" level="${log4j.default.log.level}" additivity="false">
+			<AppenderRef ref="FIDO2_SCRIPT_LOG_FILE" />
+		</Logger>
+
         <Root level="INFO">
 			<AppenderRef ref="FILE" />
 			<AppenderRef ref="STDOUT" />