Skip to content

Commit 160d0f3

Browse files
dreis2211wilkinsona
authored andcommitted
Avoid using deprecated NCSARequestLog
See spring-projectsgh-16987
1 parent 652aa6c commit 160d0f3

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222

2323
import org.apache.catalina.Valve;
2424
import org.apache.catalina.valves.AccessLogValve;
25-
import org.eclipse.jetty.server.NCSARequestLog;
25+
import org.eclipse.jetty.server.CustomRequestLog;
2626
import org.eclipse.jetty.server.RequestLog;
27+
import org.eclipse.jetty.server.RequestLogWriter;
2728
import org.eclipse.jetty.server.Server;
2829

2930
import org.springframework.beans.factory.BeanFactory;
@@ -194,17 +195,21 @@ public void customize(JettyServletWebServerFactory factory) {
194195

195196
private void customizeServer(Server server) {
196197
RequestLog requestLog = server.getRequestLog();
197-
if (requestLog != null && requestLog instanceof NCSARequestLog) {
198-
customizeRequestLog((NCSARequestLog) requestLog);
198+
if (requestLog != null && requestLog instanceof CustomRequestLog) {
199+
customizeRequestLog((CustomRequestLog) requestLog);
199200
}
200201
}
201202

202-
private void customizeRequestLog(NCSARequestLog requestLog) {
203-
String filename = requestLog.getFilename();
204-
if (StringUtils.hasLength(filename)) {
205-
File file = new File(filename);
206-
file = new File(file.getParentFile(), customizePrefix(file.getName()));
207-
requestLog.setFilename(file.getPath());
203+
private void customizeRequestLog(CustomRequestLog requestLog) {
204+
if (requestLog.getWriter() instanceof RequestLogWriter) {
205+
RequestLogWriter writer = (RequestLogWriter) requestLog.getWriter();
206+
String filename = writer.getFileName();
207+
if (StringUtils.hasLength(filename)) {
208+
File file = new File(filename);
209+
file = new File(file.getParentFile(),
210+
customizePrefix(file.getName()));
211+
writer.setFilename(file.getPath());
212+
}
208213
}
209214
}
210215

0 commit comments

Comments
 (0)