Browse Source

Polish

pull/3122/head
Phillip Webb 11 years ago
parent
commit
683c19ee8b
  1. 3
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java
  2. 6
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java
  3. 2
      spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

3
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java

@ -38,8 +38,7 @@ public class MetricExportProperties extends TriggerProperties {
/** /**
* Specific trigger properties per MetricWriter bean name. * Specific trigger properties per MetricWriter bean name.
*/ */
private Map<String, SpecificTriggerProperties> triggers private Map<String, SpecificTriggerProperties> triggers = new LinkedHashMap<String, SpecificTriggerProperties>();
= new LinkedHashMap<String, SpecificTriggerProperties>();
private Redis redis = new Redis(); private Redis redis = new Redis();

6
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DropwizardMetricWriter.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2014 the original author or authors. * Copyright 2012-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -47,8 +47,7 @@ import com.codahale.metrics.Timer;
* </ul> * </ul>
* *
* @author Dave Syer * @author Dave Syer
* * @deprecated Since 1.3 in favor of {@link DropwizardMetricServices}
* @deprecated Use {@link DropwizardMetricServices} instead
*/ */
@Deprecated @Deprecated
public class DropwizardMetricWriter implements MetricWriter { public class DropwizardMetricWriter implements MetricWriter {
@ -134,6 +133,7 @@ public class DropwizardMetricWriter implements MetricWriter {
public Double getValue() { public Double getValue() {
return this.value; return this.value;
} }
} }
} }

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@ -652,7 +652,7 @@ content into your application; rather pick only the properties that you need.
shell.auth.simple.user.name= shell.auth.simple.user.name=
shell.auth.simple.user.password= shell.auth.simple.user.password=
shell.auth.spring.roles= shell.auth.spring.roles=
# METRICS EXPORT ({sc-spring-boot-actuator}/metrics/export/MetricExportProperties.{sc-ext}[MetricExportProperties]) # METRICS EXPORT ({sc-spring-boot-actuator}/metrics/export/MetricExportProperties.{sc-ext}[MetricExportProperties])
spring.metrics.export.enabled=true # flag to disable all metric exports (assuming any MetricWriters are available) spring.metrics.export.enabled=true # flag to disable all metric exports (assuming any MetricWriters are available)
spring.metrics.export.delay-millis=5000 # delay in milliseconds between export ticks spring.metrics.export.delay-millis=5000 # delay in milliseconds between export ticks

Loading…
Cancel
Save