Log connection failures

ktorio · Dec 20, 2024 · 1b8416f · 1b8416f
1 parent 3e96bf5
commit 1b8416f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/...r-client-plugins/ktor-client-logging/common/src/io/ktor/client/plugins/logging/Logging.kt b/...r-client-plugins/ktor-client-logging/common/src/io/ktor/client/plugins/logging/Logging.kt
@@ -397,6 +397,14 @@ public val Logging: ClientPlugin<LoggingConfig> = createClientPlugin("Logging",
 
         if (stdFormat) {
             logRequestStdFormat(request)
+
+            try {
+                proceed()
+            } catch (cause: Throwable) {
+                logger.log("<-- HTTP FAILED: $cause")
+                throw cause
+            }
+
             return@on
         }
 
@@ -565,6 +573,7 @@ private object SendHook : ClientHook<suspend SendHook.Context.(response: HttpReq
 
     class Context(private val context: PipelineContext<Any, HttpRequestBuilder>) {
         suspend fun proceedWith(content: Any) = context.proceedWith(content)
+        suspend fun proceed() = context.proceed()
     }
 
     override fun install(

diff --git a/...ient-plugins/ktor-client-logging/jvm/test/io/ktor/client/plugins/logging/NewFormatTest.kt b/...ient-plugins/ktor-client-logging/jvm/test/io/ktor/client/plugins/logging/NewFormatTest.kt
@@ -23,9 +23,11 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.test.runTest
 import kotlinx.io.readByteArray
 import org.junit.jupiter.api.BeforeEach
+import java.net.UnknownHostException
 import kotlin.coroutines.CoroutineContext
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 class NewFormatTest {
@@ -724,6 +726,21 @@ class NewFormatTest {
             .assertNoMoreLogs()
     }
 
+    @Test
+    fun connectFailed() = testWithLevel(LogLevel.INFO, handle = { respondOk() }) { client ->
+        client.sendPipeline.intercept(HttpSendPipeline.Engine) {
+            throw UnknownHostException("reason")
+        }
+
+        assertFailsWith<UnknownHostException> {
+            client.get("/")
+        }
+
+        log.assertLogEqual("--> GET /")
+            .assertLogEqual("<-- HTTP FAILED: java.net.UnknownHostException: reason")
+            .assertNoMoreLogs()
+    }
+
     private fun MockRequestHandleScope.respondWithLength(): HttpResponseData {
         return respond("", headers = Headers.build {
             append("Content-Length", "0")