longer start, check kafka, too (#97)

* longer start, check kafka, too Signed-off-by: Erin Schnabel <[email protected]>
gameontext · Sep 12, 2017 · f8a4bb0 · f8a4bb0
1 parent 1a71173
commit f8a4bb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/map-app/src/main/java/org/gameontext/map/Kafka.java b/map-app/src/main/java/org/gameontext/map/Kafka.java
@@ -45,6 +45,10 @@ public class Kafka {
    public Kafka(){
    }
 
+   public boolean isHealthy() {
+       return producer != null;
+   }
+
    private boolean multipleHosts(){
        //this is a cheat, we need to enable ssl when talking to message hub, and not to kafka locally
        //the easiest way to know which we are running on, is to check how many hosts are in kafkaUrl

diff --git a/map-app/src/main/java/org/gameontext/map/MapResource.java b/map-app/src/main/java/org/gameontext/map/MapResource.java
@@ -34,6 +34,9 @@ public class MapResource {
     @Inject
     protected MapRepository mapRepository;
 
+    @Inject
+    Kafka kafka;
+
     @GET
     public Response basicGet() {
         return Response.ok().build();
@@ -48,7 +51,7 @@ public Response basicGet() {
     @io.swagger.annotations.ApiOperation(value = "Check application health",
         notes = "")
     public Response healthCheck() {
-        if ( mapRepository != null && mapRepository.connectionReady() ) {
+        if ( mapRepository != null && mapRepository.connectionReady() && kafka.isHealthy() ) {
             return Response.ok().entity("{\"status\":\"UP\"}").build();
         } else {
             return Response.status(Status.SERVICE_UNAVAILABLE).entity("{\"status\":\"DOWN\"}").build();

diff --git a/map-wlpcfg/Dockerfile b/map-wlpcfg/Dockerfile
@@ -34,7 +34,8 @@ ADD ./servers/gameon-map /opt/ibm/wlp/usr/servers/defaultServer/
 
 CMD ["/opt/startup.sh"]
 
+# Generous start time for constrained systems
 HEALTHCHECK \
   --timeout=10s \
-  --start-period=40s \
+  --start-period=2m \
   CMD wget -q -O /dev/null http://localhost:9080/map/v1/health