Merge pull request #9 from HSLdevcom/feat/robot_bus

Do not use MQTT health check with robot bus
HSLdevcom · Jun 16, 2020 · 72f3326 · 72f3326
2 parents dddd26c + ba9f1a3
commit 72f3326
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/fi/hsl/suomenlinna_hfp/Main.java b/src/main/java/fi/hsl/suomenlinna_hfp/Main.java
@@ -81,9 +81,9 @@ public static void main(String[] args) throws Throwable {
 
         if (config.getBoolean("health.enabled")) {
             if (!config.getString("health.postEndpoint").equals("")) {
-                createHealthServerWithNotification(vehiclePositionProvider, mqttHfpPublisher, config.getString("health.postEndpoint"));
+                createHealthServerWithNotification(vehiclePositionProvider, mqttHfpPublisher, configType != ConfigType.SBDRIVE, config.getString("health.postEndpoint"));
             } else {
-                createHealthServerWithoutNotification(vehiclePositionProvider, mqttHfpPublisher);
+                createHealthServerWithoutNotification(vehiclePositionProvider, mqttHfpPublisher, configType != ConfigType.SBDRIVE);
             }
         }
 
@@ -108,15 +108,19 @@ public static ConfigType getByName(String name) {
         }
     }
 
-    private static void createHealthServerWithNotification(VehiclePositionProvider vehiclePositionProvider, MqttHfpPublisher mqttHfpPublisher, String postEndpoint) throws IOException {
+    private static void createHealthServerWithNotification(VehiclePositionProvider vehiclePositionProvider, MqttHfpPublisher mqttHfpPublisher, boolean publisherHealthCheck, String postEndpoint) throws IOException {
         HealthServer healthServer = new HealthServer(8080, new HealthNotificationService(postEndpoint));
         healthServer.addCheck(() -> System.nanoTime() - vehiclePositionProvider.getLastReceivedTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
-        healthServer.addCheck(() -> System.nanoTime() - mqttHfpPublisher.getLastSentTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
+        if (publisherHealthCheck) {
+            healthServer.addCheck(() -> System.nanoTime() - mqttHfpPublisher.getLastSentTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
+        }
     }
 
-    private static void createHealthServerWithoutNotification(VehiclePositionProvider vehiclePositionProvider, MqttHfpPublisher mqttHfpPublisher) throws IOException {
+    private static void createHealthServerWithoutNotification(VehiclePositionProvider vehiclePositionProvider, MqttHfpPublisher mqttHfpPublisher, boolean publisherHealthCheck) throws IOException {
         HealthServer healthServer = new HealthServer(8080);
         healthServer.addCheck(() -> System.nanoTime() - vehiclePositionProvider.getLastReceivedTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
-        healthServer.addCheck(() -> System.nanoTime() - mqttHfpPublisher.getLastSentTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
+        if (publisherHealthCheck) {
+            healthServer.addCheck(() -> System.nanoTime() - mqttHfpPublisher.getLastSentTime() < Duration.of(10, ChronoUnit.MINUTES).toNanos());
+        }
     }
 }