Improve health information.

noboomu · Dec 14, 2020 · 5297710 · 5297710
1 parent 9992239
commit 5297710
Show file tree

Hide file tree

Showing 6 changed files with 378 additions and 328 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Proteus Changelog.
 ## Unreleased
 ### No issue
 
+**Removed swagger module and updated dependencies.**
+
+
+[999223901c55f4c](https://github.com/noboomu/proteus/commit/999223901c55f4c) Joshua Bauer *2020-11-20 21:38:54*
+
 **Async service timeouts.**
 
 

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java b/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java
@@ -1,5 +1,6 @@
 package io.sinistral.proteus;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -244,12 +245,17 @@ public void failure(Service service)
 
         undertow.start();
 
+        Duration timeout = config.getDuration("application.services.timeout");
+
         try
         {
-            serviceManager.startAsync().awaitHealthy(config.getDuration("application.services.timeout"));
-        } catch( Exception e )
+            serviceManager.startAsync().awaitHealthy(timeout);
+        } catch( TimeoutException e )
+        {
+            log.error("Failed start to services within {} minutes",timeout,e);
+        } catch (Exception e)
         {
-            log.error("Failed start to services within 2 minutes",e);
+            log.error("Failed to start services",e);
         }
 
 //        serviceManager.startAsync();
@@ -477,7 +483,15 @@ public ProteusApplication addDefaultRoutes(RoutingHandler router)
                 router.add(Methods.GET, statusPath, (final HttpServerExchange exchange) ->
                 {
                     exchange.getResponseHeaders().add(Headers.CONTENT_TYPE, MediaType.TEXT_PLAIN);
-                    exchange.getResponseSender().send("OK");
+
+                    if(this.serviceManager.servicesByState().values().stream().allMatch(Service::isRunning))
+                    {
+                        exchange.setStatusCode(200).getResponseSender().send("OK");
+                    }
+                    else
+                    {
+                        exchange.setStatusCode(500).getResponseSender().send("NOT_HEALTHY");
+                    }
                 });
 
                 this.registeredEndpoints.add(EndpointInfo.builder().withConsumes("*/*").withProduces("text/plain").withPathTemplate(statusPath).withControllerName("Internal").withMethod(Methods.GET).build());
@@ -687,4 +701,6 @@ public void printStatus()
         log.info(sb.toString());
     }
 
+
+
 }
diff --git a/proteus-core/src/main/java/io/sinistral/proteus/protocol/HealthSummary.java b/proteus-core/src/main/java/io/sinistral/proteus/protocol/HealthSummary.java
@@ -0,0 +1,7 @@
+package io.sinistral.proteus.protocol;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class HealthSummary {
+}
diff --git a/proteus-core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java b/proteus-core/src/main/java/io/sinistral/proteus/server/endpoints/EndpointInfo.java
@@ -3,12 +3,14 @@
  */
 package io.sinistral.proteus.server.endpoints;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import io.undertow.util.HttpString;
 
 /**
  * @author jbauer
  *
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class EndpointInfo implements Comparable<EndpointInfo>
 {
     private String consumes = "*/*";

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/services/DefaultService.java b/proteus-core/src/main/java/io/sinistral/proteus/services/DefaultService.java
@@ -60,6 +60,8 @@ protected void startUp() throws Exception
 
 
 
+
+
 }