flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 10:27:45 +00:00
Code Issues Releases Wiki Activity

Improve http logs

Browse Source
This commit is contained in:
Abel García de Prada 2020-10-05 14:27:26 +02:00
parent dc215dc80e
commit b7fd663d77
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogBuilder.kt
View File

@ -22,18 +22,25 @@
*/
package com.owncloud.android.lib.common.http
import timber.log.Timber
import java.util.Locale
object LogBuilder {
fun toLogString(
fun logHttp(
networkPetition: NetworkPetition,
networkNode: NetworkNode,
description: String
): String = "[Network, $networkPetition] [$networkNode] $description"
) = Timber.d("[Network, $networkPetition] [$networkNode] $description")
}
enum class NetworkPetition {
REQUEST, RESPONSE
REQUEST, RESPONSE;
override fun toString(): String = super.toString().toLowerCase(Locale.ROOT)
}
enum class NetworkNode {
INFO, HEADER, BODY
INFO, HEADER, BODY;
override fun toString(): String = super.toString().toLowerCase(Locale.ROOT)
}

29
owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt
View File

@ -23,12 +23,11 @@
*/
package com.owncloud.android.lib.common.http
import com.owncloud.android.lib.common.http.LogBuilder.toLogString
import com.owncloud.android.lib.common.http.LogBuilder.logHttp
import com.owncloud.android.lib.common.http.NetworkNode.*
import com.owncloud.android.lib.common.http.NetworkPetition.*
import okhttp3.Interceptor
import okhttp3.Response
import timber.log.Timber
class LogInterceptor : Interceptor {
@ -39,28 +38,14 @@ class LogInterceptor : Interceptor {
return response.also {
if (httpLogsEnabled) {
// Log request
Timber.d(
toLogString(REQUEST, INFO, "Type: ${it.request.method} URL: ${it.request.url}")
)
it.headers.forEach { header ->
Timber.d(toLogString(REQUEST, HEADER, header.toString()))
}
Timber.d(toLogString(REQUEST, BODY, it.body.toString()))
logHttp(REQUEST, INFO, "Type: ${it.request.method} URL: ${it.request.url}")
it.headers.forEach { header -> logHttp(REQUEST, HEADER, header.toString()) }
logHttp(REQUEST, BODY, it.body.toString())
// Log response
Timber.d(toLogString(RESPONSE, INFO, "RequestId: ${it.request.header(HttpConstants.OC_X_REQUEST_ID)}"))
Timber.d(
toLogString(
RESPONSE,
INFO,
"Code: ${it.code} Message: ${it.message} IsSuccessful: ${it.isSuccessful}"
)
)
it.headers.forEach { header ->
Timber.d(toLogString(RESPONSE, HEADER, header.toString()))
}
Timber.d(toLogString(RESPONSE, BODY, it.body.toString()))
logHttp(RESPONSE, INFO, "Code: ${it.code} Message: ${it.message} IsSuccessful: ${it.isSuccessful}")
it.headers.forEach { header -> logHttp(RESPONSE, HEADER, header.toString()) }
logHttp(RESPONSE, BODY, it.body.toString())
}
}
}