Added more log information hexagontk#272

mrpascal1 · Mar 19, 2020 · 04db141 · 04db141
1 parent 5ca4cd1
commit 04db141
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/hexagon_web/src/main/kotlin/com/hexagonkt/web/Web.kt b/hexagon_web/src/main/kotlin/com/hexagonkt/web/Web.kt
@@ -1,5 +1,6 @@
 package com.hexagonkt.web
 
+import com.hexagonkt.helpers.logger
 import java.util.Locale.forLanguageTag as localeFor
 
 import com.hexagonkt.http.server.Call
@@ -14,6 +15,8 @@ fun Call.templateType(template: String) {
     if (response.contentType == null) {
         val mimeType = SerializationManager.contentTypeOf(template.substringAfterLast('.'))
         response.contentType = "$mimeType; charset=${defaultCharset().name()}"
+        logger.trace { response }
+        logger.trace { response.contentType }
     }
 }
 
@@ -22,6 +25,7 @@ fun Call.fullContext(): Map<String, *> {
         "path" to request.path.removeSuffix("/"), // Do not allow trailing slash
         "lang" to obtainLocale().language
     )
+    logger.trace { extraParameters }
 
     return settings + session.attributes + extraParameters
 }

diff --git a/http_client_ahc/src/main/kotlin/com/hexagonkt/http/client/ahc/AhcAdapter.kt b/http_client_ahc/src/main/kotlin/com/hexagonkt/http/client/ahc/AhcAdapter.kt
@@ -1,6 +1,7 @@
 package com.hexagonkt.http.client.ahc
 
 import com.hexagonkt.helpers.ensureSize
+import com.hexagonkt.helpers.logger
 import com.hexagonkt.helpers.stream
 import com.hexagonkt.serialization.SerializationManager.formatOf
 import com.hexagonkt.serialization.serialize
@@ -106,6 +107,7 @@ class AhcAdapter : ClientPort {
     private fun keyStore(uri: URI, password: String): KeyStore {
         val keyStore = KeyStore.getInstance("pkcs12")
         keyStore.load(uri.stream(), password.toCharArray())
+        logger.trace { keyStore }
         return keyStore
     }
 
@@ -126,6 +128,7 @@ class AhcAdapter : ClientPort {
             }
 
         val response = ahcRequest.execute().get()
+        logger.trace { response }
 
         if (settings.useCookies) {
             response.cookies.forEach {
@@ -142,6 +145,7 @@ class AhcAdapter : ClientPort {
                 .map { it to response.headers.getAll(it) }
                 .toMap()
         )
+        logger.trace { returnHeaders }
 
         return response.let {
             Response(
@@ -179,6 +183,14 @@ class AhcAdapter : ClientPort {
         }
 
         ssl = cl.settings
+
+        logger.trace { method }
+        logger.trace { path }
+        logger.trace { settings }
+        logger.trace { contentType }
+        logger.trace { parts }
+        logger.trace { ssl }
+
         val req = when (method) {
             GET -> ahcClient.prepareGet(path)
             HEAD -> ahcClient.prepareHead(path)
@@ -206,6 +218,7 @@ class AhcAdapter : ClientPort {
         if (authorization != null)
             req.addHeader("Authorization", "Basic $authorization")
 
+        logger.trace { req }
         return req
     }
 }