fix: rest log interceptor logger name inject

1000kit · Jun 11, 2024 · 4d07e12 · 4d07e12
1 parent 4d226b0
commit 4d07e12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/docs/modules/tkit-quarkus/pages/includes/attributes.adoc b/docs/modules/tkit-quarkus/pages/includes/attributes.adoc
@@ -1,4 +1,4 @@
-:project-version: 2.23.0
+:project-version: 2.24.0
 :quarkus-version: 3.11.1
 
 :examples-dir: ./../examples/
diff --git a/extensions/log/rs/runtime/src/main/java/org/tkit/quarkus/log/rs/RestInterceptorContext.java b/extensions/log/rs/runtime/src/main/java/org/tkit/quarkus/log/rs/RestInterceptorContext.java
@@ -23,6 +23,8 @@ public class RestInterceptorContext {
 
     boolean exclude = false;
 
+    String logger;
+
     Set<String> mdcKeys = new HashSet<>();
 
     private final long startTime;

diff --git a/extensions/log/rs/runtime/src/main/java/org/tkit/quarkus/log/rs/RestLogInterceptor.java b/extensions/log/rs/runtime/src/main/java/org/tkit/quarkus/log/rs/RestLogInterceptor.java
@@ -61,7 +61,8 @@ public void filter(ContainerRequestContext requestContext) {
             });
         }
 
-        restContext.ano = RestRecorder.getRestService(resourceInfo.getResourceClass().getName(),
+        restContext.logger = resourceInfo.getResourceClass().getName();
+        restContext.ano = RestRecorder.getRestService(restContext.logger,
                 resourceInfo.getResourceMethod().getName());
 
         UriInfo uriInfo = requestContext.getUriInfo();
@@ -75,7 +76,7 @@ public void filter(ContainerRequestContext requestContext) {
             log = restContext.ano.config.log;
         }
         if (config.start.enabled && log) {
-            LoggerFactory.getLogger(resourceInfo.getResourceClass())
+            LoggerFactory.getLogger(restContext.logger)
                     .info(String.format(config.start.template, restContext.method, restContext.path, restContext.uri));
         }
         requestContext.setProperty(CONTEXT, restContext);
@@ -131,7 +132,7 @@ public void filter(ContainerRequestContext requestContext, ContainerResponseCont
                     restContext.mdcKeys.add(config.end.mdc.responseStatusName);
                 }
 
-                LoggerFactory.getLogger(resourceInfo.getResourceClass())
+                LoggerFactory.getLogger(restContext.logger)
                         .info(String.format(config.end.template, restContext.method, restContext.path,
                                 restContext.durationString, status.getStatusCode(), status.getReasonPhrase(),
                                 restContext.uri));