SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Converts Map to JSON. Fixes json format errors with Hystrix Dashboard. (#2950)

Browse Source
This commit is contained in:
Ryan Baxter
2018-05-22 15:56:40 -04:00
committed by GitHub
parent fe3f0209da
commit 56772eeb6c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-netflix-turbine-stream/src/main/java/org/springframework/cloud/netflix/turbine/stream/TurbineController.java
View File

@@ -22,6 +22,7 @@ import java.util.Map;
import com.netflix.turbine.aggregator.InstanceKey;
import com.netflix.turbine.aggregator.StreamAggregator;
import com.netflix.turbine.internal.JsonUtility;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.http.MediaType;
@@ -37,7 +38,7 @@ import rx.subjects.PublishSubject;
public class TurbineController {
private static final Log log = LogFactory.getLog(TurbineController.class);
private final Flux<Map<String, Object>> flux;
private final Flux<String> flux;
public TurbineController(PublishSubject<Map<String, Object>> hystrixSubject) {
Observable<Map<String, Object>> stream = StreamAggregator.aggregateGroupedStreams(hystrixSubject.groupBy(
@@ -47,13 +48,12 @@ public class TurbineController {
Flux<Map<String, Object>> ping = Flux.interval(Duration.ofSeconds(5), Duration.ofSeconds(10))
.map(l -> Collections.singletonMap("type", (Object) "ping"))
.share();
flux = Flux.merge(RxReactiveStreams.toPublisher(stream), ping)
.share();
.share().map(map -> JsonUtility.mapToJson(map));
}
@GetMapping(produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<Map<String, Object>> stream() {
public Flux<String> stream() {
return this.flux;
}
}