diff --git a/backend/src/main/java/com/shyashyashya/refit/global/auth/service/JwtAuthenticationFilter.java b/backend/src/main/java/com/shyashyashya/refit/global/auth/service/JwtAuthenticationFilter.java index 1e8856901..bf2983079 100644 --- a/backend/src/main/java/com/shyashyashya/refit/global/auth/service/JwtAuthenticationFilter.java +++ b/backend/src/main/java/com/shyashyashya/refit/global/auth/service/JwtAuthenticationFilter.java @@ -15,6 +15,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.jspecify.annotations.NonNull; +import org.slf4j.MDC; import org.springframework.core.annotation.Order; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; @@ -59,6 +60,7 @@ protected void doFilterInternal( requestUserContext.setEmail(email); requestUserContext.setUserId(userId); + MDC.put("userInfo", email); if (isGuestRequest(userId)) { validateGuestRequestNotIllegal(request); diff --git a/backend/src/main/java/com/shyashyashya/refit/global/config/QuestionEmbeddingAsyncConfig.java b/backend/src/main/java/com/shyashyashya/refit/global/config/QuestionEmbeddingAsyncConfig.java index e32f78aaa..d66579768 100644 --- a/backend/src/main/java/com/shyashyashya/refit/global/config/QuestionEmbeddingAsyncConfig.java +++ b/backend/src/main/java/com/shyashyashya/refit/global/config/QuestionEmbeddingAsyncConfig.java @@ -16,7 +16,7 @@ public Executor embeddingTaskExecutor() { executor.setCorePoolSize(2); executor.setMaxPoolSize(5); executor.setQueueCapacity(100); - executor.setThreadNamePrefix("QuestionEmbedding-Thread-"); + executor.setThreadNamePrefix("qna-embed-"); executor.initialize(); return executor; } diff --git a/backend/src/main/java/com/shyashyashya/refit/global/filter/ApiLoggingFilter.java b/backend/src/main/java/com/shyashyashya/refit/global/filter/ApiLoggingFilter.java index eb074d7e6..c75d3b7bb 100644 --- a/backend/src/main/java/com/shyashyashya/refit/global/filter/ApiLoggingFilter.java +++ b/backend/src/main/java/com/shyashyashya/refit/global/filter/ApiLoggingFilter.java @@ -39,7 +39,7 @@ protected void doFilterInternal( String clientIp = getClientIp(request); String queryString = request.getQueryString(); String decodedQueryString = ""; - MDC.put("clientIp", clientIp); + MDC.put("userInfo", clientIp); if (queryString != null && !queryString.isEmpty()) { decodedQueryString = "?" + URLDecoder.decode(queryString, StandardCharsets.UTF_8); @@ -57,7 +57,7 @@ protected void doFilterInternal( long duration = System.currentTimeMillis() - startTime; int status = response.getStatus(); log.info("[Resp] HTTP {} ({} {}) - {}ms", status, method, requestUriWithQuery, duration); - MDC.remove("clientIp"); + MDC.remove("userInfo"); MDC.clear(); } } diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml index eee334ba2..c0ae67645 100644 --- a/backend/src/main/resources/logback-spring.xml +++ b/backend/src/main/resources/logback-spring.xml @@ -5,7 +5,7 @@ - %clr(%d{MM-dd HH:mm:ss.SS}){faint} %clr(%5p) %clr([%X{traceId:-NO_TRACE}]){yellow} %clr([%-15.15X{clientIp:-NO_IP}]){blue} %clr([%10.10t]){faint} %clr(%-32.32logger{32}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} + %clr(%d{MM-dd HH:mm:ss.SS}){faint} %clr(%5p) %clr([%X{traceId:-NO_TRACE}]){yellow} %clr([%-15.-15X{userInfo:-NO_INFO}]){blue} %clr([%13.13t]){faint} %clr(%-26.26logger{26}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} @@ -13,7 +13,7 @@ logs/refit-application.log - %d{yyyy-MM-dd HH:mm:ss.SS} %5p [%X{traceId:-NO_TRACE}] [%-15.15X{clientIp:-NO_IP}] [%10.10t] %-32.32logger{32} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} + %d{yyyy-MM-dd HH:mm:ss.SS} %5p [%X{traceId:-NO_TRACE}] [%-15.-15X{userInfo:-NO_INFO}] [%13.13t] %-26.26logger{26} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}