mirror of
https://gitlab.com/mangadex-pub/mangadex_at_home.git
synced 2024-01-19 02:48:37 +00:00
Merge branch 'add-response-timings' into 'master'
Added response timings to trace logs and response headers See merge request mangadex/mangadex_at_home!24
This commit is contained in:
commit
a8126b9026
|
@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
### Added
|
||||
- [2020-06-14] Added new `client_hostname` selector to allow for custom address binding for Netty by [@lflare].
|
||||
- [2020-06-14] Added new `ui_hostname` selector to allow for custom address binding for WebUiNetty by [@lflare].
|
||||
- [2020-06-14] Added response timings to trace logs and response headers by [@lflare].
|
||||
|
||||
### Changed
|
||||
|
||||
|
|
|
@ -18,7 +18,8 @@ import java.util.concurrent.atomic.AtomicReference
|
|||
fun getServer(cache: DiskLruCache, serverSettings: ServerSettings, clientSettings: ClientSettings, statistics: AtomicReference<Statistics>): Http4kServer {
|
||||
val imageServer = ImageServer(cache, statistics, serverSettings.imageServer)
|
||||
|
||||
return catchAllHideDetails()
|
||||
return Timer
|
||||
.then(catchAllHideDetails())
|
||||
.then(ServerFilters.CatchLensFailure)
|
||||
.then(addCommonHeaders())
|
||||
.then(
|
||||
|
|
|
@ -68,8 +68,10 @@ class ImageServer(private val cache: DiskLruCache, private val statistics: Atomi
|
|||
val snapshot = cache.get(cacheId)
|
||||
if (snapshot != null) {
|
||||
request.handleCacheHit(sanitizedUri, getRc4(rc4Bytes), snapshot)
|
||||
.header("X-Uri", sanitizedUri)
|
||||
} else {
|
||||
request.handleCacheMiss(sanitizedUri, getRc4(rc4Bytes), cacheId)
|
||||
.header("X-Uri", sanitizedUri)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
/* ktlint-disable no-wildcard-imports */
|
||||
package mdnet.base.server
|
||||
|
||||
import java.time.ZoneOffset
|
||||
import java.time.ZonedDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.*
|
||||
import mdnet.base.Constants
|
||||
import org.http4k.core.Filter
|
||||
import org.http4k.core.HttpHandler
|
||||
|
@ -8,13 +12,8 @@ import org.http4k.core.Request
|
|||
import org.http4k.core.Response
|
||||
import org.http4k.core.Status
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.time.ZoneOffset
|
||||
import java.time.ZonedDateTime
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.util.*
|
||||
|
||||
private val HTTP_TIME_FORMATTER = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy HH:mm:ss O", Locale.ENGLISH)
|
||||
|
||||
private val LOGGER = LoggerFactory.getLogger("Application")
|
||||
|
||||
fun addCommonHeaders(): Filter {
|
||||
|
@ -41,3 +40,24 @@ fun catchAllHideDetails(): Filter {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
val Timer = Filter {
|
||||
next: HttpHandler -> {
|
||||
request: Request ->
|
||||
val start = System.currentTimeMillis()
|
||||
val response = next(request)
|
||||
val latency = System.currentTimeMillis() - start
|
||||
if (LOGGER.isTraceEnabled && response.header("X-Uri") != null) {
|
||||
// Dirty hack to get sanitizedUri from ImageServer
|
||||
val sanitizedUri = response.header("X-Uri")
|
||||
|
||||
// Log in TRACE
|
||||
LOGGER.trace("Request for $sanitizedUri completed in ${latency}ms")
|
||||
|
||||
// Delete response header entirely
|
||||
response.header("X-Uri", null)
|
||||
}
|
||||
// Set response header with processing times
|
||||
response.header("X-Time-Taken", latency.toString())
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue