Merge pull request #3109 from izeye/patch-14

* patch-14:
  Remove duplicate in MetricExportProperties
pull/3110/merge
Stephane Nicoll 10 years ago
commit 0d1235ee2a

@ -35,12 +35,8 @@ import org.springframework.util.StringUtils;
@ConfigurationProperties("spring.metrics.export")
public class MetricExportProperties extends TriggerProperties {
/**
* Flag to disable all metric exports (assuming any MetricWriters are available).
*/
private boolean enabled = true;
private Map<String, SpecificTriggerProperties> triggers = new LinkedHashMap<String, SpecificTriggerProperties>();
private Map<String, SpecificTriggerProperties> triggers
= new LinkedHashMap<String, SpecificTriggerProperties>();
private Redis redis = new Redis();
@ -70,16 +66,6 @@ public class MetricExportProperties extends TriggerProperties {
}
}
@Override
public boolean isEnabled() {
return this.enabled;
}
@Override
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
/**
* Configuration for triggers on individual named writers. Each value can individually
* specify a name pattern explicitly, or else the map key will be used if the name is

Loading…
Cancel
Save