root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #14637 from izeye 

* pr/14637:
  Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
This commit is contained in:
Stephane Nicoll 2018-09-30 17:49:34 -04:00
parent 9a4f655d10 1e756db966
commit 42a77a09f4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,8 +23,8 @@ import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.Meter.Id; import io.micrometer.core.instrument.Meter.Id;
import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.config.MeterFilterReply; import io.micrometer.core.instrument.config.MeterFilterReply;
import org.slf4j.Logger; import org.apache.commons.logging.Log;
import org.slf4j.LoggerFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -38,8 +38,8 @@ import org.springframework.util.Assert;
*/ */
public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter { public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
private final Logger logger = LoggerFactory private static final Log logger = LogFactory
.getLogger(OnlyOnceLoggingDenyMeterFilter.class); .getLog(OnlyOnceLoggingDenyMeterFilter.class);
private final AtomicBoolean alreadyWarned = new AtomicBoolean(false); private final AtomicBoolean alreadyWarned = new AtomicBoolean(false);
@ -52,9 +52,8 @@ public final class OnlyOnceLoggingDenyMeterFilter implements MeterFilter {
@Override @Override
public MeterFilterReply accept(Id id) { public MeterFilterReply accept(Id id) {
if (this.logger.isWarnEnabled() if (logger.isWarnEnabled() && this.alreadyWarned.compareAndSet(false, true)) {
&& this.alreadyWarned.compareAndSet(false, true)) { logger.warn(this.message.get());
this.logger.warn(this.message.get());
} }
return MeterFilterReply.DENY; return MeterFilterReply.DENY;
} }