do not log response bodies on status codes 3xx as they are not errors…

… (2nd attempt)
linked-planet · Apr 19, 2023 · dd38b6a · dd38b6a
1 parent f6c1857
commit dd38b6a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...some-logging/src/main/kotlin/com/linkedplanet/ktor/client/logging/AwesomeClientLogging.kt b/...some-logging/src/main/kotlin/com/linkedplanet/ktor/client/logging/AwesomeClientLogging.kt
@@ -89,14 +89,14 @@ val AwesomeClientLogging = createClientPlugin("AwesomeClientLogging", ::AwesomeC
 
     onResponse { response ->
         val body =
-            if (response.status.isSuccess() || response.status.isRedirect() || !config.responseConfig.logBodyOnError)
-                null
-            else {
+            if (response.status.isError() && config.responseConfig.logBodyOnError) {
                 val wrapped = response.call.wrapWithContent(response.content)
                 wrapped.response.contentType()?.let { contentType ->
                     val charset = contentType.charset() ?: Charsets.UTF_8
                     wrapped.response.content.tryReadText(charset) ?: "[response body unavailable]"
                 }
+            } else {
+                null
             }
         logResponse(config, response, body)
     }
@@ -122,8 +122,8 @@ private suspend fun logResponse(config: AwesomeClientLoggingConfig, response: Ht
     val message = "${config.responseConfig.prefix}${statusCode}: ${from}${logBody}"
     withMdc(config.traceIdFieldName to traceId) {
         val level =
-            if (response.status.isSuccess()) config.responseConfig.levelSuccess
-            else config.responseConfig.levelError
+            if (response.status.isError()) config.responseConfig.levelError
+            else config.responseConfig.levelSuccess
         config.logger.log(message, level)
     }
 }
@@ -134,7 +134,7 @@ private suspend inline fun ByteReadChannel.tryReadText(charset: Charset): String
     null
 }
 
-private fun HttpStatusCode.isRedirect(): Boolean = value in (300 until 400)
+private fun HttpStatusCode.isError(): Boolean = value >= 400
 
 class AwesomeClientLoggingConfig {