spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 07:43:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2019-02-04 10:00:29 -05:00
parent 33b84b15e1 ebfc626538
commit b0335afd69
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTask.java
+2 -2
View File
@@ -89,7 +89,7 @@ public class HystrixStreamTask implements ApplicationContextAware {
}
// TODO: use integration to split this up?
@Scheduled(fixedRateString = "${hystrix.stream.queue.sendRate:500}")
@Scheduled(fixedRateString = "${hystrix.stream.queue.sendRate:${hystrix.stream.queue.send-rate:500}}")
public void sendMetrics() {
ArrayList<String> metrics = new ArrayList<>();
this.jsonMetrics.drainTo(metrics);
@@ -117,7 +117,7 @@ public class HystrixStreamTask implements ApplicationContextAware {
}
}
@Scheduled(fixedRateString = "${hystrix.stream.queue.gatherRate:500}")
@Scheduled(fixedRateString = "${hystrix.stream.queue.gatherRate:${hystrix.stream.queue.gather-rate:500}}")
public void gatherMetrics() {
try {
// command metrics