Merge pull request #164 from swyp3-babpool/refactor/logging

Refactor/logging
swyp3-babpool · Apr 4, 2024 · c65c925 · c65c925
2 parents 9739cfb + f0194cf
commit c65c925
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/github-actions-server.yaml b/.github/workflows/github-actions-server.yaml
@@ -1,4 +1,4 @@
-name: Spring Boot Gradle CICD (version 0.1.4)
+name: Spring Boot Gradle CICD (version 0.1.5)
 
 on:
   push:

diff --git a/src/main/java/com/swyp3/babpool/domain/appointment/config/AppointmentWebSocketHandler.java b/src/main/java/com/swyp3/babpool/domain/appointment/config/AppointmentWebSocketHandler.java
@@ -41,17 +41,10 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
         }
         String authorization = accessor.getFirstNativeHeader(AUTHORIZATION);
         String accessToken = getAccessTokenFrom(authorization);
-        log.info("accessToken in AppointmentWebSocketHandler.class: {}", accessToken);
 
-        Claims authenticatedClaims = null;
         try {
             if (StringUtils.hasText(accessToken)) {
-                authenticatedClaims = jwtAuthenticator.authenticate(accessToken);
-            }
-            if (!authenticatedClaims.isEmpty()){
-                Long userId = jwtAuthenticator.jwtTokenUserIdResolver(authenticatedClaims.getSubject());
-//                accessor.getSessionAttributes().put("userId", userId);
-//                accessor.setHeader("userId", userId);
+                jwtAuthenticator.authenticate(accessToken);
             }
         } catch (NullPointerException | IllegalStateException e) {
             log.error("Not found Token // token : {}", accessToken);
@@ -67,11 +60,11 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
             throw new BadCredentialsException(JwtExceptionErrorCode.UNSUPPORTED_TOKEN, "throw new unsupported token exception");
         } catch (Exception e) {
             log.error("====================================================");
-            log.error("Babpool JwtTokenInterceptor - preHandle() 오류 발생");
+            log.error("Babpool AppointmentWebSocketHandler - preHandle() 오류 발생");
             log.error("token : {}", accessToken);
             log.error("Exception Message : {}", e.getMessage());
             log.error("Exception StackTrace : {");
-            e.printStackTrace();
+            e.getStackTrace()[0].toString();
             log.error("}");
             log.error("====================================================");
             throw new BadCredentialsException(JwtExceptionErrorCode.NOT_FOUND_TOKEN, "throw new exception");

diff --git a/src/main/java/com/swyp3/babpool/global/jwt/JwtTokenInterceptor.java b/src/main/java/com/swyp3/babpool/global/jwt/JwtTokenInterceptor.java
@@ -66,7 +66,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
             log.error("token : {}", accessToken);
             log.error("Exception Message : {}", e.getMessage());
             log.error("Exception StackTrace : {");
-            e.printStackTrace();
+            e.getStackTrace()[0].toString();
             log.error("}");
             log.error("====================================================");
             throw new BadCredentialsException(JwtExceptionErrorCode.NOT_FOUND_TOKEN, "throw new exception");

diff --git a/src/main/java/com/swyp3/babpool/global/logging/MdcLoggingFilter.java b/src/main/java/com/swyp3/babpool/global/logging/MdcLoggingFilter.java
@@ -5,6 +5,7 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -15,11 +16,17 @@
 import org.springframework.web.util.ContentCachingResponseWrapper;
 
 import java.io.IOException;
-import java.util.UUID;
+import java.util.*;
 
+@Slf4j
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class MdcLoggingFilter extends OncePerRequestFilter{
+
+    private static ArrayList<String> NOT_LOGGING_MONITORING = new ArrayList<>(Arrays.asList(
+            "/api/actuator/**"
+    ));
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         ContentCachingRequestWrapper requestWrapper = new ContentCachingRequestWrapper(request);
@@ -44,4 +51,13 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
         MDC.remove("request_uuid");
         MDC.clear();
     }
+
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
+        if (NOT_LOGGING_MONITORING.contains(request.getRequestURI())) {
+            log.info("Monitoring URI: {}", request.getRequestURI(), "\t Client IP: {}", request.getRemoteAddr());
+            return true;
+        }
+        return false;
+    }
 }
diff --git a/src/main/java/com/swyp3/babpool/infra/auth/kakao/KakaoTokenProvider.java b/src/main/java/com/swyp3/babpool/infra/auth/kakao/KakaoTokenProvider.java
@@ -81,7 +81,7 @@ public String getIdTokenFromKakao(String code) {
                 return idToken;
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            log.error("카카오로부터 Token 조회 실패, {}", e.getStackTrace()[0]);
             throw new AuthException(AuthExceptionErrorCode.AUTH_ERROR_CONNECT_WITH_KAKAO,
                     e.getMessage().toString());
         }