EG-2684 Ensure original message is logged with old-style error codes (c…

…orda#6340) * [EG-2684] Ensure original message is logged with old-style error codes * [EG-2684] Address detekt issues
shaoyangdd · Jun 12, 2020 · 2c253d8 · 2c253d8
1 parent ef00fa1
commit 2c253d8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt b/common/logging/src/main/kotlin/net/corda/common/logging/ExceptionsErrorCodeFunctions.kt
@@ -32,8 +32,9 @@ fun Message.withErrorCodeFor(error: Throwable?, level: Level): Message {
 
     return when {
         error != null && level.isInRange(Level.FATAL, Level.WARN) -> {
+            val logMessage = this.formattedMessage
             val message = error.walkExceptionCausedByList().asSequence().mapNotNull(Throwable::message).joinToString(" - ")
-            CompositeMessage("$message [errorCode=${error.errorCode()}, moreInformationAt=${error.errorCodeLocationUrl()}]", format, parameters, throwable)
+            CompositeMessage("$logMessage - $message [errorCode=${error.errorCode()}, moreInformationAt=${error.errorCodeLocationUrl()}]", format, parameters, throwable)
         }
         else -> this
     }

diff --git a/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt b/common/logging/src/test/kotlin/net/corda/commmon/logging/ExceptionsErrorCodeFunctionsTest.kt
@@ -0,0 +1,34 @@
+package net.corda.commmon.logging
+
+import com.natpryce.hamkrest.assertion.assertThat
+import com.natpryce.hamkrest.contains
+import net.corda.common.logging.withErrorCodeFor
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.message.SimpleMessage
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class ExceptionsErrorCodeFunctionsTest {
+
+    @Test(timeout=3_000)
+    fun `error code for message prints out message and full stack trace`() {
+        val originalMessage = SimpleMessage("This is a test message")
+        var previous: Exception? = null
+        val throwables = (0..10).map {
+            val current = TestThrowable(it, previous)
+            previous = current
+            current
+        }
+        val exception = throwables.last()
+        val message = originalMessage.withErrorCodeFor(exception, Level.ERROR)
+        assertThat(message.formattedMessage, contains("This is a test message".toRegex()))
+        for (i in (0..10)) {
+            assertThat(message.formattedMessage, contains("This is exception $i".toRegex()))
+        }
+        assertEquals(message.format, originalMessage.format)
+        assertEquals(message.parameters, originalMessage.parameters)
+        assertEquals(message.throwable, originalMessage.throwable)
+    }
+
+    private class TestThrowable(index: Int, cause: Exception?) : Exception("This is exception $index", cause)
+}