Merge branch 'feature/DRAW-240' into sandbox

YAPP-Github · Aug 18, 2024 · e0474de · e0474de
2 parents 48fb2a2 + 2ad7447
commit e0474de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt b/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt
@@ -7,8 +7,8 @@ import ch.qos.logback.contrib.json.classic.JsonLayout
 class XorkerJsonLayout : JsonLayout() {
 
     init {
-        setTimestampFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-        setTimestampFormatTimezoneId("UTC")
+        setTimestampFormat("yyyy-MM-dd'T'HH:mm:ss.SSS")
+        setTimestampFormatTimezoneId("Asia/Seoul")
         appendLineSeparator = true
 
         jsonFormatter = JacksonJsonFormatter().apply {

diff --git a/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt.rej b/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt.rej
@@ -0,0 +1,12 @@
+diff a/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt b/support/logging/src/main/kotlin/com/xorker/draw/support/logging/XorkerJsonLayout.kt	(rejected hunks)
+@@ -7,8 +7,8 @@
+ class XorkerJsonLayout : JsonLayout() {
+
+     init {
+-        setTimestampFormat("yyyy-MM-dd'T'HH:mm:ss.SSS")
+-        setTimestampFormatTimezoneId("Asia/Seoul")
++        setTimestampFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
++        setTimestampFormatTimezoneId("UTC")
+         appendLineSeparator = true
+
+         jsonFormatter = JacksonJsonFormatter().apply {