Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/tony/logback' into featu…
Browse files Browse the repository at this point in the history
…re/tony/logback

# Conflicts:
#	build.gradle.kts
#	src/main/kotlin/com/hh2/katj/payment/service/PaymentMethodValidationApi.kt
#	src/main/resources/logback-spring.xml
  • Loading branch information
TonyKim9401 committed Oct 30, 2023
2 parents 1174217 + 61de1dc commit 179717f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,16 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-logging")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.springframework.boot:spring-boot-starter-aop")

// 로그백 의존성
// implementation("io.github.microutils:kotlin-logging:1.12.5")
implementation(group = "ca.pjer", name = "logback-awslogs-appender", version = "1.6.0")

// 프로퍼티 제어 in xml
implementation("org.codehaus.janino:janino:3.1.10")

// 스케줄링 처리를 위한 코루틴 라이브러리 추가
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")

// Retry 추가
implementation("org.springframework:spring-aspects")
implementation("org.springframework.retry:spring-retry")
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

<springProfile name="prod">
<include resource="aws-appender.xml"/>

<root level="ERROR">
<appender-ref ref="ASYNC_AWS_LOGS"/>
</root>
</springProfile>

</configuration>

0 comments on commit 179717f

Please sign in to comment.