Skip to content

Commit 9f496b9

Browse files
Merge pull request #44 from chinmoy12c/hotfix/fix_campaign_health_endpoint
Fixed campaign healthpoint according to v2 changes.
2 parents 1ce2546 + 86787b4 commit 9f496b9

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

src/main/java/com/uci/utils/UtilHealthService.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
public class UtilHealthService {
3232
@Value("${campaign.url}")
3333
String campaignUrl;
34+
35+
@Value("${campaign.admin.token}")
36+
String campaignAdminToken;
3437

3538
@Autowired
3639
private KafkaConfig kafkaConfig;
@@ -68,18 +71,22 @@ public Mono<JsonNode> getCampaignUrlHealthNode() {
6871
try {
6972
WebClient webClient = WebClient.create(campaignUrl);
7073
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)
7276
.retrieve()
7377
.bodyToMono(JsonNode.class)
7478
.onErrorResume(e -> {
7579
failed.put("message", e.getMessage());
76-
return Mono.just(mapper.createObjectNode().set("result", failed));
80+
return Mono.just(failed);
7781
})
7882
.map(jsonNode -> {
7983
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"));
8390
}
8491
return result;
8592
});

0 commit comments

Comments
 (0)