From 17fdf3743734c969ef8ec8ce8ecf588bc13072fa Mon Sep 17 00:00:00 2001 From: urviljoshi Date: Fri, 22 Apr 2022 16:09:37 +0530 Subject: [PATCH 1/2] health check issue resolved --- .../pridgenerator/config/PridServiceHealthCheckerhandler.java | 3 ++- .../kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/config/PridServiceHealthCheckerhandler.java b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/config/PridServiceHealthCheckerhandler.java index ab3f41df3b6..15b4c32b19b 100644 --- a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/config/PridServiceHealthCheckerhandler.java +++ b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/config/PridServiceHealthCheckerhandler.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import io.mosip.kernel.pridgenerator.constant.EventType; import io.mosip.kernel.pridgenerator.constant.HibernatePersistenceConstant; import io.mosip.kernel.pridgenerator.constant.PRIDGeneratorConstant; import io.mosip.kernel.pridgenerator.constant.PRIDHealthConstants; @@ -156,7 +157,7 @@ public void dispSpaceHealthChecker(Future future) { */ public void verticleHealthHandler(Future future, Vertx vertx) { - vertx.eventBus().send(PRIDGeneratorConstant.PRID_GENERATOR_ADDRESS, PRIDHealthConstants.PING, response -> { + vertx.eventBus().send(EventType.CHECKPOOL, PRIDHealthConstants.PING, response -> { if (response.succeeded()) { final JsonObject result = resultBuilder.create() diff --git a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java index 442b5642af4..1e6da673cc4 100644 --- a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java +++ b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridPoolCheckerVerticle.java @@ -6,6 +6,7 @@ import org.springframework.core.env.Environment; import io.mosip.kernel.pridgenerator.constant.EventType; +import io.mosip.kernel.pridgenerator.constant.PRIDHealthConstants; import io.mosip.kernel.pridgenerator.constant.PridLifecycleStatus; import io.mosip.kernel.pridgenerator.service.PridService; import io.vertx.core.AbstractVerticle; @@ -64,6 +65,7 @@ public void start(Future startFuture) { LOGGER.info("event type is send {} eventBus{}", handler.isSend(), eventBus); LOGGER.info("locked generation"); } + handler.reply(PRIDHealthConstants.ACTIVE); }); MessageConsumer initPoolConsumer = eventBus.consumer(EventType.INITPOOL); From 224199ecd8563acb00688f68a81b3112097cc4a7 Mon Sep 17 00:00:00 2001 From: urviljoshi Date: Fri, 22 Apr 2022 13:53:40 +0530 Subject: [PATCH 2/2] health check issue resolved --- .../kernel/pridgenerator/verticle/PridFetcherVerticle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridFetcherVerticle.java b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridFetcherVerticle.java index 661518d3c0d..1268046e5db 100644 --- a/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridFetcherVerticle.java +++ b/kernel/kernel-pridgenerator-service/src/main/java/io/mosip/kernel/pridgenerator/verticle/PridFetcherVerticle.java @@ -67,7 +67,7 @@ public void start(Future future) { .produces(PRIDGeneratorConstant.APPLICATION_JSON); // mount all the routers to parent router parentRouter.mountSubRouter(environment.getProperty(PRIDGeneratorConstant.SERVER_SERVLET_PATH), metricRouter); - parentRouter.mountSubRouter(environment.getProperty(PRIDGeneratorConstant.SERVER_SERVLET_PATH), healthCheckRouter); + parentRouter.get(environment.getProperty(PRIDGeneratorConstant.SERVER_SERVLET_PATH)+PRIDGeneratorConstant.HEALTH_ENDPOINT).handler(healthCheckHandler); parentRouter.mountSubRouter( environment.getProperty(PRIDGeneratorConstant.SERVER_SERVLET_PATH) + PRIDGeneratorConstant.PRID, pridFetcherRouter.createRouter(vertx));