|
31 | 31 | public class UtilHealthService { |
32 | 32 | @Value("${campaign.url}") |
33 | 33 | String campaignUrl; |
| 34 | + |
| 35 | + @Value("${campaign.admin.token}") |
| 36 | + String campaignAdminToken; |
34 | 37 |
|
35 | 38 | @Autowired |
36 | 39 | private KafkaConfig kafkaConfig; |
@@ -68,18 +71,22 @@ public Mono<JsonNode> getCampaignUrlHealthNode() { |
68 | 71 | try { |
69 | 72 | WebClient webClient = WebClient.create(campaignUrl); |
70 | 73 | return webClient.get() |
71 | | - .uri(builder -> builder.path("admin/v1/health").build()) |
| 74 | + .uri(builder -> builder.path("admin/health/ping").build()) |
| 75 | + .header("admin-token", campaignAdminToken) |
72 | 76 | .retrieve() |
73 | 77 | .bodyToMono(JsonNode.class) |
74 | 78 | .onErrorResume(e -> { |
75 | 79 | failed.put("message", e.getMessage()); |
76 | | - return Mono.just(mapper.createObjectNode().set("result", failed)); |
| 80 | + return Mono.just(failed); |
77 | 81 | }) |
78 | 82 | .map(jsonNode -> { |
79 | 83 | ObjectNode result = mapper.createObjectNode(); |
80 | | - result.put("status", jsonNode.get("result").get("status").textValue()); |
81 | | - if (jsonNode.get("result").get("status").textValue().equals(Status.DOWN.getCode())) { |
82 | | - result.set("message", jsonNode.get("result").get("message")); |
| 84 | + if (jsonNode.get("status").textValue().equalsIgnoreCase("ok")) { |
| 85 | + result.put("status", jsonNode.get("details").get("UCI-API").get("status").textValue().equalsIgnoreCase(Status.UP.getCode()) ? "UP" : "DOWN"); |
| 86 | + } |
| 87 | + else { |
| 88 | + result.put("status", "DOWN"); |
| 89 | + result.set("message", jsonNode.get("message")); |
83 | 90 | } |
84 | 91 | return result; |
85 | 92 | }); |
|
0 commit comments