Fjerner overflødige helsesjekker

lundal · lundal · commit 29ed7029edd0 · 2017-08-07T09:58:08.000+02:00
diff --git a/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/addon/ActiveMqAddon.java b/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/addon/ActiveMqAddon.java
@@ -121,12 +121,12 @@ public void addToJettyServer(JettyServer jettyServer) {
             String queueError = handlerDescription.messageDescription.getErrorQueueName();
             ObosHealthCheckRegistry.registerActiveMqCheck("Input queue: " + queueInput + " on " + url, url, queueInput, handlerDescription.healthCheckEntriesMax, handlerDescription.healthCheckEntriesGrace, user, password);
             ObosHealthCheckRegistry.registerActiveMqCheck("Error queue: " + queueError + " on " + url, url, queueError, 1, 1, user, password);
-            ObosHealthCheckRegistry.registerCustomCheck("ActiveMqListener active", () ->
-                    listener.isListenerActive()
-                            ? ObosHealthCheckResult.ok()
-                            : ObosHealthCheckResult.error("ActiveMqListener not active")
-            );
         });
+        ObosHealthCheckRegistry.registerCustomCheck("ActiveMqListener active", () ->
+                listener.isListenerActive()
+                        ? ObosHealthCheckResult.ok()
+                        : ObosHealthCheckResult.error("ActiveMqListener not active")
+        );
     }
 
     @Override
diff --git a/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqListener.java b/servicebuilder-mq-activemq/src/main/java/no/obos/util/servicebuilder/mq/activemq/ActiveMqListener.java
@@ -35,6 +35,7 @@ public void startListener(ImmutableSet<MqHandlerImpl<?>> handlers) {
         if (listenerActive) {
             throw new RuntimeException("Multiple active sessions in same listener. Check if starting connection threw exception and ActiveMQ ActiveMQConnection.setExceptionListener() failed at the same time.");
         }
+        listenerActive = true;
         threadIsInterrupted = false;
         try {
             activeMqConnectionProvider.startListenerSession((connection, session) -> {
@@ -48,7 +49,6 @@ public void startListener(ImmutableSet<MqHandlerImpl<?>> handlers) {
                                 .mqHandlerForwarder(mqHandlerForwarder)
                                 .build();
                         activeMqListener.startListener();
-                        listenerActive = true;
                     } catch (JMSException ex) {
                         throw new RuntimeException(ex);
                     }
