From 5cb846f9309df110745b2dfe69d1ed57b7d5f394 Mon Sep 17 00:00:00 2001
From: Oniqued <zktl3575@gmail.com>
Date: Sat, 19 Oct 2024 16:05:50 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat(logback)=20:=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EB=B0=B1=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   2 +-
 .../resources/log/config/error-config.xml     |  57 --------
 src/main/resources/log/config/info-config.xml |  52 -------
 src/main/resources/log/config/warn-config.xml |  61 --------
 src/main/resources/logback-dev.xml            |  35 -----
 src/main/resources/logback-prod.xml           |  12 --
 src/main/resources/logback-spring.xml         | 134 ++++++++++++++++--
 7 files changed, 126 insertions(+), 227 deletions(-)
 delete mode 100644 src/main/resources/log/config/error-config.xml
 delete mode 100644 src/main/resources/log/config/info-config.xml
 delete mode 100644 src/main/resources/log/config/warn-config.xml
 delete mode 100644 src/main/resources/logback-dev.xml
 delete mode 100644 src/main/resources/logback-prod.xml

diff --git a/.gitignore b/.gitignore
index 0eb9aad1..01ef7c5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,4 @@ out/
 .vscode/
 
 ### LOG ###
-/src/main/resources/log/history/**
+/logs
diff --git a/src/main/resources/log/config/error-config.xml b/src/main/resources/log/config/error-config.xml
deleted file mode 100644
index 353168c0..00000000
--- a/src/main/resources/log/config/error-config.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<included>
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <!-- 로그 레벨 포함 -->
-                <logLevel>
-                    <fieldName>level</fieldName>
-                </logLevel>
-
-                <!-- MDC 포함 -->
-                <mdc>
-                </mdc>
-
-                <!-- 타임스탬프 포함 -->
-                <timestamp>
-                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSSSS</pattern>
-                </timestamp>
-
-                <!-- 로거 이름 포함 -->
-                <loggerName>
-                    <fieldName>logger</fieldName>
-                </loggerName>
-
-                <!-- 메시지 포함 -->
-                <message>
-                    <fieldName>message</fieldName>
-                </message>
-
-                <!-- 예외 정보 포함 -->
-                <stackTrace>
-                    <fieldName>stacktrace</fieldName>
-                </stackTrace>
-            </providers>
-
-            <!-- JSON을 보기 좋게 정렬 -->
-            <jsonGeneratorDecorator class="net.logstash.logback.decorate.PrettyPrintingJsonGeneratorDecorator"/>
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 로그 파일이 생성될 경로 및 파일 이름 패턴 -->
-            <fileNamePattern>src/main/resources/log/history/%d{yyyy-MM-dd}/error-%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-
-            <!-- 로그 파일을 최대 30일간 보관 -->
-            <maxHistory>30</maxHistory>
-
-            <!-- 총 로그 파일 크기 제한 -->
-            <totalSizeCap>5GB</totalSizeCap>
-        </rollingPolicy>
-    </appender>
-</included>
diff --git a/src/main/resources/log/config/info-config.xml b/src/main/resources/log/config/info-config.xml
deleted file mode 100644
index 50615bf3..00000000
--- a/src/main/resources/log/config/info-config.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<included>
-    <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>INFO</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <!-- 로그 레벨 포함 -->
-                <logLevel>
-                    <fieldName>level</fieldName>
-                </logLevel>
-
-                <!-- MDC 포함 -->
-                <mdc>
-                </mdc>
-
-                <!-- 타임스탬프 포함 -->
-                <timestamp>
-                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSSSS</pattern>
-                </timestamp>
-
-                <!-- 메시지 포함 -->
-                <message>
-                    <fieldName>message</fieldName>
-                </message>
-
-                <!-- 예외 정보 포함 -->
-                <stackTrace>
-                    <fieldName>stacktrace</fieldName>
-                </stackTrace>
-            </providers>
-
-            <!-- JSON을 보기 좋게 정렬 -->
-            <jsonGeneratorDecorator class="net.logstash.logback.decorate.PrettyPrintingJsonGeneratorDecorator"/>
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 로그 파일이 생성될 경로 및 파일 이름 패턴 -->
-            <fileNamePattern>home/ec2-user/log/history/%d{yyyy-MM-dd}/info-%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-
-            <!-- 로그 파일을 최대 30일간 보관 -->
-            <maxHistory>30</maxHistory>
-
-            <!-- 총 로그 파일 크기 제한 -->
-            <totalSizeCap>5GB</totalSizeCap>
-        </rollingPolicy>
-    </appender>
-</included>
diff --git a/src/main/resources/log/config/warn-config.xml b/src/main/resources/log/config/warn-config.xml
deleted file mode 100644
index a1a7d979..00000000
--- a/src/main/resources/log/config/warn-config.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<included>
-    <appender name="WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>WARN</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-
-        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <providers>
-                <!-- MDC 포함 -->
-                <mdc/>
-
-                <!-- 로그 레벨 포함 -->
-                <logLevel>
-                    <fieldName>level</fieldName>
-                </logLevel>
-
-                <!-- 타임스탬프 포함 -->
-                <timestamp>
-                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSSSS</pattern>
-                </timestamp>
-
-                <!-- 쓰레드 정보 포함 -->
-                <threadName>
-                    <fieldName>thread</fieldName>
-                </threadName>
-
-                <!-- 로거 이름 포함 -->
-                <loggerName>
-                    <fieldName>logger</fieldName>
-                </loggerName>
-
-                <!-- 메시지 포함 -->
-                <message>
-                    <fieldName>message</fieldName>
-                </message>
-
-                <!-- 예외 정보 포함 -->
-                <stackTrace>
-                    <fieldName>stacktrace</fieldName>
-                </stackTrace>
-            </providers>
-
-            <!-- JSON을 보기 좋게 정렬 -->
-            <jsonGeneratorDecorator class="net.logstash.logback.decorate.PrettyPrintingJsonGeneratorDecorator"/>
-        </encoder>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 로그 파일이 생성될 경로 및 파일 이름 패턴 -->
-            <fileNamePattern>src/main/resources/log/history/%d{yyyy-MM-dd}/warn-%d{yyyy-MM-dd}.log.zip</fileNamePattern>
-
-            <!-- 로그 파일을 최대 30일간 보관 -->
-            <maxHistory>30</maxHistory>
-
-            <!-- 총 로그 파일 크기 제한 -->
-            <totalSizeCap>5GB</totalSizeCap>
-        </rollingPolicy>
-    </appender>
-</included>
diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml
deleted file mode 100644
index e771b953..00000000
--- a/src/main/resources/logback-dev.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-default}"/>
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>${CONSOLE_LOG_CHARSET}</charset>
-        </encoder>
-    </appender>
-
-    <!-- Logback 내부 초기화 로그 억제 -->
-    <logger name="ch.qos.logback" level="ERROR"/>
-    <logger name="org.springframework.boot.logging.logback" level="ERROR"/>
-
-    <!-- 특정 클래스나 패키지의 로그 레벨 설정 -->
-    <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-    <logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
-    <logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
-    <logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
-    <logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
-    <logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
-    <logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
-    <logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
-
-    <root level="${logging.level.root:-INFO}">
-        <appender-ref ref="CONSOLE"/>
-    </root>
-</configuration>
diff --git a/src/main/resources/logback-prod.xml b/src/main/resources/logback-prod.xml
deleted file mode 100644
index a033d5d5..00000000
--- a/src/main/resources/logback-prod.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="log/config/error-config.xml" />
-    <include resource="log/config/warn-config.xml" />
-    <include resource="log/config/info-config.xml" />
-
-    <root level="${logging.level.root:-INFO}">
-        <appender-ref ref="INFO"/>
-        <appender-ref ref="ERROR"/>
-        <appender-ref ref="WARN"/>
-    </root>
-</configuration>
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index e771b953..d8442e68 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <!--  콘솔 출력 폼 설정  -->
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
     <conversionRule conversionWord="wex"
                     converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
@@ -8,12 +9,6 @@
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-default}"/>
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-            <charset>${CONSOLE_LOG_CHARSET}</charset>
-        </encoder>
-    </appender>
 
     <!-- Logback 내부 초기화 로그 억제 -->
     <logger name="ch.qos.logback" level="ERROR"/>
@@ -29,7 +24,128 @@
     <logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
     <logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
 
-    <root level="${logging.level.root:-INFO}">
-        <appender-ref ref="CONSOLE"/>
-    </root>
+    <!-- 콘솔 로깅 -->
+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
+        </encoder>
+    </appender>
+
+    <property name="LOG_PATH" value="./logs"/>
+    <property name="LOG_FILE_NAME" value="info"/>
+    <property name="ERR_LOG_FILE_NAME" value="error"/>
+
+    <!-- API 로깅 -->
+    <appender name="ApiLogFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>${LOG_PATH}/${LOG_FILE_NAME}.log</file>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <!-- 로그 레벨 포함 -->
+                <logLevel>
+                    <fieldName>level</fieldName>
+                </logLevel>
+
+                <!-- MDC 포함 -->
+                <mdc>
+                </mdc>
+
+                <!-- 타임스탬프 포함 -->
+                <timestamp>
+                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSSSS</pattern>
+                </timestamp>
+
+                <!-- 메시지 포함 -->
+                <message>
+                    <fieldName>message</fieldName>
+                </message>
+
+                <!-- 예외 정보 포함 -->
+                <stackTrace>
+                    <fieldName>stacktrace</fieldName>
+                </stackTrace>
+            </providers>
+        </encoder>
+
+        <!-- 하루에 한번 압축 후 보관, 최대 30일, 1GB까지 보관 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${LOG_FILE_NAME}.%d{yyyy-MM-dd}.gz</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <!-- 오류 로깅 -->
+    <appender name="ErrorLogFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+        <file>${LOG_PATH}/${ERR_LOG_FILE_NAME}.log</file>
+        <encoder class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
+            <providers>
+                <!-- 로그 레벨 포함 -->
+                <logLevel>
+                    <fieldName>level</fieldName>
+                </logLevel>
+
+                <!-- MDC 포함 -->
+                <mdc>
+                </mdc>
+
+                <!-- 타임스탬프 포함 -->
+                <timestamp>
+                    <pattern>yyyy-MM-dd'T'HH:mm:ss.SSSSSS</pattern>
+                </timestamp>
+
+                <!-- 로거 이름 포함 -->
+                <loggerName>
+                    <fieldName>logger</fieldName>
+                </loggerName>
+
+                <!-- 메시지 포함 -->
+                <message>
+                    <fieldName>message</fieldName>
+                </message>
+
+                <!-- 예외 정보 포함 -->
+                <stackTrace>
+                    <fieldName>stacktrace</fieldName>
+                </stackTrace>
+            </providers>
+        </encoder>
+
+        <!-- 하루에 한번 압축 후 보관, 최대 30일, 1GB까지 보관 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/${ERR_LOG_FILE_NAME}.%d{yyyy-MM-dd}.gz</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <!-- Logstash 로깅 -->
+    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>logstash:50000</destination>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder" />
+    </appender>
+
+    <springProfile name="dev">
+        <root level="${logging.level.root:-INFO}">
+            <appender-ref ref="Console" />
+        </root>
+    </springProfile>
+
+    <springProfile name="prod">
+        <root level="${logging.level.root:-INFO}">
+            <appender-ref ref="ApiLogFile" />
+            <appender-ref ref="ErrorLogFile" />
+            <appender-ref ref="LOGSTASH" />
+        </root>
+    </springProfile>
 </configuration>

From bcb5f3857c82e765757698409e4f2022981a6db2 Mon Sep 17 00:00:00 2001
From: Oniqued <zktl3575@gmail.com>
Date: Sat, 19 Oct 2024 16:06:12 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix(Dockerfile)=20:=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=B3=BC=EB=A5=A8=20=EC=9E=AC=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 943c1858..11b23b79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
 FROM openjdk:17-ea-11-jdk-slim
-VOLUME /tmp
+VOLUME /logs
 COPY build/libs/backend-0.0.1-SNAPSHOT.jar FriendShip.jar
 ENTRYPOINT ["java", "-jar", "FriendShip.jar"]
\ No newline at end of file

From 14889d0cf8bfabc4a7e3e2b82abbaba0c290953a Mon Sep 17 00:00:00 2001
From: Oniqued <zktl3575@gmail.com>
Date: Sat, 19 Oct 2024 16:08:34 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix(friendship-pipeline.yml)=20:=20docker?=
 =?UTF-8?q?=20run=20=EC=8B=9C,=20=EB=B3=BC=EB=A5=A8=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/friendship-pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/friendship-pipeline.yml b/.github/workflows/friendship-pipeline.yml
index ad5549fb..84fbae09 100644
--- a/.github/workflows/friendship-pipeline.yml
+++ b/.github/workflows/friendship-pipeline.yml
@@ -91,7 +91,7 @@ jobs:
             sudo docker rm friendship || true
             
             # 새 friendship 컨테이너 실행
-            sudo docker run -d --log-driver=syslog -p 443:8080 --name friendship --network friendship-network -e spring.profiles.active=prod -e TZ=Asia/Seoul ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}:latest
+            sudo docker run -v /home/ec2-user/elk/logs:/logs -d --log-driver=syslog -p 443:8080 --name friendship --network friendship-network -e spring.profiles.active=prod -e TZ=Asia/Seoul ${{ secrets.DOCKER_USERNAME }}/${{ env.APP_NAME }}:latest
             
             # friendship 관련 종료된 컨테이너 삭제
             sudo docker container prune -f