Skip to content

Commit dc31b11

Browse files
committed
add beforeRequest logging configuration option
1 parent 1cb8ade commit dc31b11

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

LavalinkServer/application.yml.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ logging:
9696
includeQueryString: true
9797
includePayload: true
9898
maxPayloadLength: 10000
99-
99+
beforeRequest: false
100100

101101
logback:
102102
rollingpolicy:

LavalinkServer/src/main/java/lavalink/server/config/RequestLoggingConfig.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ data class RequestLoggingConfig(
1515
var includeQueryString: Boolean = true,
1616
var includePayload: Boolean = true,
1717
var maxPayloadLength: Int = 10000,
18+
var beforeRequest: Boolean = false,
1819
) {
1920

2021
@Bean

LavalinkServer/src/main/java/lavalink/server/io/RequestLoggingFilter.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory
66
import org.springframework.web.filter.AbstractRequestLoggingFilter
77

88
class RequestLoggingFilter(
9-
requestLoggingConfig: RequestLoggingConfig
9+
private val requestLoggingConfig: RequestLoggingConfig
1010
) : AbstractRequestLoggingFilter() {
1111

1212
companion object {
@@ -19,11 +19,18 @@ class RequestLoggingFilter(
1919
isIncludeQueryString = requestLoggingConfig.includeQueryString
2020
isIncludePayload = requestLoggingConfig.includePayload
2121
maxPayloadLength = requestLoggingConfig.maxPayloadLength
22+
setBeforeMessagePrefix("Incoming request: ")
23+
setBeforeMessageSuffix("")
2224
setAfterMessagePrefix("")
2325
setAfterMessageSuffix("")
2426
}
2527

26-
override fun beforeRequest(request: HttpServletRequest, message: String) {}
28+
override fun beforeRequest(request: HttpServletRequest, message: String) {
29+
if (!requestLoggingConfig.beforeRequest) {
30+
return
31+
}
32+
log.info(message)
33+
}
2734

2835
override fun afterRequest(request: HttpServletRequest, message: String) {
2936
log.info(message)

docs/configuration/config/environment-variables.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ LOGGING_REQUEST_INCLUDE_HEADERS
107107
LOGGING_REQUEST_INCLUDE_QUERY_STRING
108108
LOGGING_REQUEST_INCLUDE_PAYLOAD
109109
LOGGING_REQUEST_MAX_PAYLOAD_LENGTH
110+
LOGGING_REQUEST_BEFORE_REQUEST
110111
111112
LOGGING_LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE
112113
LOGGING_LOGBACK_ROLLINGPOLICY_MAX_HISTORY

0 commit comments

Comments
 (0)