Skip to content

Commit bcf075b

Browse files
committed
Polish "Add property to specify the management access log prefix"
See gh-43434
1 parent 020fd7b commit bcf075b

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ public Accesslog getAccesslog() {
126126
public static class Accesslog {
127127

128128
/**
129-
* Enable management access logs prefix customization
130-
* management.server.accesslog.prefix.
129+
* Management log file name prefix.
131130
*/
132131
private String prefix = "management_";
133132

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

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -85,22 +85,20 @@ ServletManagementWebServerFactoryCustomizer servletManagementWebServerFactoryCus
8585

8686
@Bean
8787
@ConditionalOnClass(name = "io.undertow.Undertow")
88-
UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer(
89-
ManagementServerProperties managementServerProperties) {
90-
return new UndertowAccessLogCustomizer(managementServerProperties);
88+
UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer(ManagementServerProperties properties) {
89+
return new UndertowAccessLogCustomizer(properties);
9190
}
9291

9392
@Bean
9493
@ConditionalOnClass(name = "org.apache.catalina.valves.AccessLogValve")
95-
TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer(
96-
ManagementServerProperties managementServerProperties) {
97-
return new TomcatAccessLogCustomizer(managementServerProperties);
94+
TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer(ManagementServerProperties properties) {
95+
return new TomcatAccessLogCustomizer(properties);
9896
}
9997

10098
@Bean
10199
@ConditionalOnClass(name = "org.eclipse.jetty.server.Server")
102-
JettyAccessLogCustomizer jettyManagementAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
103-
return new JettyAccessLogCustomizer(managementServerProperties);
100+
JettyAccessLogCustomizer jettyManagementAccessLogCustomizer(ManagementServerProperties properties) {
101+
return new JettyAccessLogCustomizer(properties);
104102
}
105103

106104
@Configuration(proxyBeanMethods = false)
@@ -149,18 +147,18 @@ private String getContextPath(ManagementServerProperties managementServerPropert
149147

150148
abstract static class AccessLogCustomizer implements Ordered {
151149

152-
protected final ManagementServerProperties managementServerProperties;
150+
private final ManagementServerProperties properties;
153151

154-
AccessLogCustomizer(ManagementServerProperties managementServerProperties) {
155-
this.managementServerProperties = managementServerProperties;
152+
AccessLogCustomizer(ManagementServerProperties properties) {
153+
this.properties = properties;
156154
}
157155

158156
protected String customizePrefix(String prefix) {
159157
prefix = (prefix != null) ? prefix : "";
160-
if (prefix.startsWith(this.managementServerProperties.getAccesslog().getPrefix())) {
158+
if (prefix.startsWith(this.properties.getAccesslog().getPrefix())) {
161159
return prefix;
162160
}
163-
return this.managementServerProperties.getAccesslog().getPrefix() + prefix;
161+
return this.properties.getAccesslog().getPrefix() + prefix;
164162
}
165163

166164
@Override
@@ -173,8 +171,8 @@ public int getOrder() {
173171
static class TomcatAccessLogCustomizer extends AccessLogCustomizer
174172
implements WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
175173

176-
TomcatAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
177-
super(managementServerProperties);
174+
TomcatAccessLogCustomizer(ManagementServerProperties properties) {
175+
super(properties);
178176
}
179177

180178
@Override
@@ -183,7 +181,6 @@ public void customize(TomcatServletWebServerFactory factory) {
183181
if (accessLogValve == null) {
184182
return;
185183
}
186-
187184
accessLogValve.setPrefix(customizePrefix(accessLogValve.getPrefix()));
188185
}
189186

@@ -201,8 +198,8 @@ private AccessLogValve findAccessLogValve(TomcatServletWebServerFactory factory)
201198
static class UndertowAccessLogCustomizer extends AccessLogCustomizer
202199
implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
203200

204-
UndertowAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
205-
super(managementServerProperties);
201+
UndertowAccessLogCustomizer(ManagementServerProperties properties) {
202+
super(properties);
206203
}
207204

208205
@Override
@@ -215,8 +212,8 @@ public void customize(UndertowServletWebServerFactory factory) {
215212
static class JettyAccessLogCustomizer extends AccessLogCustomizer
216213
implements WebServerFactoryCustomizer<JettyServletWebServerFactory> {
217214

218-
JettyAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
219-
super(managementServerProperties);
215+
JettyAccessLogCustomizer(ManagementServerProperties properties) {
216+
super(properties);
220217
}
221218

222219
@Override

0 commit comments

Comments
 (0)