diff --git a/.github/workflows/be-merge-dev.yml b/.github/workflows/be-merge-dev.yml index 608e86505..66a000a8d 100644 --- a/.github/workflows/be-merge-dev.yml +++ b/.github/workflows/be-merge-dev.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: - branches: [ develop ] + branches: [ develop-BE ] types: [ closed ] paths: backend/** diff --git a/.github/workflows/be-pull-request.yml b/.github/workflows/be-pull-request.yml index ab62a78ef..0f5de95b7 100644 --- a/.github/workflows/be-pull-request.yml +++ b/.github/workflows/be-pull-request.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: - branches: [ main, develop ] + branches: [ main, develop-BE ] paths: backend/** permissions: diff --git a/backend/src/main/resources/application-dev.yml b/backend/src/main/resources/application-dev.yml index 703003e89..122d5ea23 100644 --- a/backend/src/main/resources/application-dev.yml +++ b/backend/src/main/resources/application-dev.yml @@ -23,8 +23,8 @@ logging: # jar 파일 실행 시, jar 파일과 동일한 디렉토리 내 log 디렉토리에 생성됨 path: /home/ubuntu/backend/build/log pattern: - console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" - file: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" + console: "%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] ${PID} %highlight(%5level) %cyan(%logger) - %msg%n" + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] ${PID} %5level %logger - %msg%n" oauth: kakao: diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index b88d6f7d0..59dc54baf 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -10,11 +10,10 @@ spring: logging: file: - # jar 파일 실행 시, jar 파일과 동일한 디렉토리 내 log 디렉토리에 생성됨 path: /home/ubuntu/backend/build/log pattern: - console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" - file: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" + console: "%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] ${PID} %highlight(%5level) %cyan(%logger) - %msg%n" + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] ${PID} %5level %logger - %msg%n" oauth: kakao: diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 6a1d55ec1..4d2cf048d 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -22,11 +22,10 @@ logging: sql: BasicBinder: TRACE file: - # jar 파일 실행 시, jar 파일과 동일한 디렉토리 내 log 디렉토리에 생성됨 path: ./log pattern: - console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" - file: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" + console: "%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] ${PID} %highlight(%5level) %cyan(%logger) - %msg%n" + file: "%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] ${PID} %5level %logger - %msg%n" oauth: kakao: diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml index da5246e91..6ca7c8d12 100644 --- a/backend/src/main/resources/logback-spring.xml +++ b/backend/src/main/resources/logback-spring.xml @@ -1,17 +1,16 @@ - + + - - - - ${LOG_PATTERN} - - + + + ${CONSOLE_LOG_PATTERN} + @@ -24,7 +23,7 @@ ${LOG_PATH}/warn.log - ${LOG_PATTERN} + ${FILE_LOG_PATTERN} @@ -38,7 +37,7 @@ ${LOG_PATH}/error.log - ${LOG_PATTERN} + ${FILE_LOG_PATTERN} diff --git a/backend/src/test/resources/application.yml b/backend/src/test/resources/application.yml index 109e8daf4..65e0aadb0 100644 --- a/backend/src/test/resources/application.yml +++ b/backend/src/test/resources/application.yml @@ -21,10 +21,8 @@ spring: logging: level: org.hibernate.orm.jdbc.bind: trace - org.hibernate.type: trace - org.hibernate.stat: debug pattern: - console: "%d{yyyy-MM-dd HH:mm:ss.SSS} %msg %n" + console: "%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] ${PID} %highlight(%5level) %cyan(%logger) - %msg%n" oauth: kakao: diff --git a/backend/src/test/resources/logback-spring.xml b/backend/src/test/resources/logback-spring.xml new file mode 100644 index 000000000..0bf60ac9b --- /dev/null +++ b/backend/src/test/resources/logback-spring.xml @@ -0,0 +1,19 @@ + + + + + + + + ${LOG_PATTERN} + + + + + + + + + + + diff --git a/backend/src/test/resources/logback-test.xml b/backend/src/test/resources/logback-test.xml deleted file mode 100644 index af76e11c4..000000000 --- a/backend/src/test/resources/logback-test.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - ${LOG_PATTERN} - - - - - - - - -