[release] 진행상황 Main 브랜치에 반영

.github/workflows/cd-develop.yml

@@ -12,7 +12,6 @@ on:
 permissions:
   contents: read
 
-
 jobs:
   # 1. 도커 이미지 빌드 및 푸시
   build-docker-image:
@@ -145,7 +144,9 @@ jobs:
             --name github-actions-demo \
             --network wayble-network \
             -p 8080:8080 \
+            -v /var/log/wayble:/app/logs \
             -e "SPRING_PROFILES_ACTIVE=develop" \
+            -e "TZ=Asia/Seoul" \
             ${{ secrets.DOCKERHUB_USERNAME }}/github-actions-demo:latest
 
       - name: Test application health

.gitignore

@@ -39,3 +39,6 @@ out/
 
 ### application.yml ###
 application.yml
+
+### Logs ###
+logs/

build.gradle

@@ -63,6 +63,9 @@ dependencies {
 
 	// web client
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+	// csv 파서
+	implementation 'org.apache.commons:commons-csv:1.10.0'
 }
 
 tasks.named('test') {

docker-compose.yml

@@ -14,6 +14,11 @@ services:
       - SPRING_PROFILES_ACTIVE=develop
       - ELASTICSEARCH_HOST=elasticsearch
       - ELASTICSEARCH_PORT=9200
+      - TZ=Asia/Seoul
+      - JAVA_TOOL_OPTIONS=-Duser.timezone=Asia/Seoul
+      - LOG_DIR=/app/logs
+    volumes:
+      - ./logs:/app/logs  # 로그 파일 영속성을 위한 볼륨 마운트
     depends_on:
       - elasticsearch
     networks:

src/main/java/com/wayble/server/admin/controller/AdminLogController.java

@@ -0,0 +1,55 @@
+package com.wayble.server.admin.controller;
+
+import com.wayble.server.admin.dto.log.ErrorLogDto;
+import com.wayble.server.admin.service.LogService;
+import com.wayble.server.admin.service.LogService.ErrorLogStats;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/admin/logs")
+@RequiredArgsConstructor
+public class AdminLogController {
+
+    private final LogService logService;
+
+    /**
+     * 에러 로그 관리 페이지
+     */
+    @GetMapping("/error")
+    public String errorLogPage(
+            @RequestParam(defaultValue = "100") int limit,
+            Model model
+    ) {
+        List<ErrorLogDto> errorLogs = logService.getRecentErrorLogs(limit);
+        ErrorLogStats stats = logService.getErrorLogStats();
+
+        model.addAttribute("errorLogs", errorLogs);
+        model.addAttribute("stats", stats);
+        model.addAttribute("limit", limit);
+
+        return "admin/log/error-logs";
+    }
+
+    /**
+     * 에러 로그 Ajax 조회
+     */
+    @GetMapping("/error/data")
+    @ResponseBody
+    public List<ErrorLogDto> getErrorLogs(@RequestParam(defaultValue = "100") int limit) {
+        return logService.getRecentErrorLogs(limit);
+    }
+
+    /**
+     * 에러 로그 통계 Ajax 조회
+     */
+    @GetMapping("/error/stats")
+    @ResponseBody
+    public ErrorLogStats getErrorLogStats() {
+        return logService.getErrorLogStats();
+    }
+}

src/main/java/com/wayble/server/admin/dto/log/ErrorLogDto.java

@@ -0,0 +1,102 @@
+package com.wayble.server.admin.dto.log;
+
+import java.time.LocalDateTime;
+
+public record ErrorLogDto(
+        LocalDateTime timestamp,
+        String level,
+        String logger,
+        String message,
+        String exception,
+        String method,
+        String path,
+        String stackTrace
+) {
+    public static ErrorLogDto from(String logEntry) {
+        try {
+            // 멀티라인 로그 엔트리 파싱
+            if (!logEntry.contains("ERROR")) {
+                return null;
+            }
+
+            String[] lines = logEntry.split("\n");
+            String firstLine = lines[0];
+
+            // 타임스탬프 추출
+            int timestampEnd = firstLine.indexOf("]");
+            if (timestampEnd == -1) return null;
+
+            String timestampStr = firstLine.substring(1, timestampEnd);
+            LocalDateTime timestamp = LocalDateTime.parse(timestampStr.replace(" ", "T"));
+
+            // 레벨 추출  
+            int levelStart = firstLine.indexOf("ERROR");
+            int levelEnd = levelStart + 5;
+            String level = "ERROR";
+
+            // 로거명 추출
+            int loggerStart = levelEnd + 1;
+            int loggerEnd = firstLine.indexOf(" - ");
+            if (loggerEnd == -1) return null;
+
+            String logger = firstLine.substring(loggerStart, loggerEnd).trim();
+
+            // 메시지 추출
+            String fullMessage = firstLine.substring(loggerEnd + 3);
+
+            // HTTP Method, Path, Location 추출
+            String method = "";
+            String path = "";
+            String location = "";
+            if (fullMessage.contains("Method:") && fullMessage.contains("Path:")) {
+                String[] parts = fullMessage.split(", ");
+                for (String part : parts) {
+                    if (part.contains("Method:")) {
+                        method = part.substring(part.indexOf("Method:") + 8).trim();
+                    } else if (part.contains("Path:")) {
+                        path = part.substring(part.indexOf("Path:") + 6).trim();
+                    } else if (part.contains("Location:")) {
+                        location = part.substring(part.indexOf("Location:") + 10).trim();
+                    }
+                }
+            }
+
+            // 스택트레이스 추출 (예외 세부정보와 첫 번째 at 라인 찾기)
+            String stackTrace = "";
+            String exceptionDetail = "";
+
+            if (lines.length > 1) {
+                for (int i = 1; i < lines.length; i++) {
+                    String line = lines[i].trim();
+
+                    // 예외 세부 정보 라인 (org.springframework.web.bind.MethodArgumentNotValidException: ...)
+                    if (line.contains("Exception:") && exceptionDetail.isEmpty()) {
+                        // 예외 타입과 상세 설명 포함 (더 긴 길이 허용)
+                        if (line.length() > 1000) {
+                            exceptionDetail = line.substring(0, 1000) + "...";
+                        } else {
+                            exceptionDetail = line;
+                        }
+                        continue;
+                    }
+
+                    // 첫 번째 스택트레이스 라인 찾기
+                    if (line.startsWith("at ")) {
+                        stackTrace = line.substring(3); // "at " 제거
+                        break;
+                    }
+                }
+            }
+
+            // 예외 정보는 exceptionDetail이 있으면 그것을, 없으면 전체 메시지
+            String exception = !exceptionDetail.isEmpty() ? exceptionDetail : fullMessage;
+
+            return new ErrorLogDto(timestamp, level, logger, fullMessage, exception, method, path, 
+                    stackTrace.isEmpty() ? location : stackTrace);
+
+        } catch (Exception e) {
+            // 파싱 실패시 null 반환
+            return null;
+        }
+    }
+}