Skip to content

Commit 42a77a0

Browse files
committed
Merge pull request #14637 from izeye
* pr/14637: Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
2 parents 9a4f655 + 1e756db commit 42a77a0

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import io.micrometer.core.instrument.Meter.Id;
2424
import io.micrometer.core.instrument.config.MeterFilter;
2525
import io.micrometer.core.instrument.config.MeterFilterReply;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
26+
import org.apache.commons.logging.Log;
27+
import org.apache.commons.logging.LogFactory;
2828

2929
import org.springframework.util.Assert;
3030

@@ -38,8 +38,8 @@
3838
*/
3939
public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
4040

41-
private final Logger logger = LoggerFactory
42-
.getLogger(OnlyOnceLoggingDenyMeterFilter.class);
41+
private static final Log logger = LogFactory
42+
.getLog(OnlyOnceLoggingDenyMeterFilter.class);
4343

4444
private final AtomicBoolean alreadyWarned = new AtomicBoolean(false);
4545

@@ -52,9 +52,8 @@ public OnlyOnceLoggingDenyMeterFilter(Supplier<String> message) {
5252

5353
@Override
5454
public MeterFilterReply accept(Id id) {
55-
if (this.logger.isWarnEnabled()
56-
&& this.alreadyWarned.compareAndSet(false, true)) {
57-
this.logger.warn(this.message.get());
55+
if (logger.isWarnEnabled() && this.alreadyWarned.compareAndSet(false, true)) {
56+
logger.warn(this.message.get());
5857
}
5958
return MeterFilterReply.DENY;
6059
}

0 commit comments

Comments
 (0)