added fail check for health

advantageous · Jul 9, 2015 · 9338ae3 · 9338ae3
1 parent 9750f03
commit 9338ae3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/qbit/core/src/main/java/io/advantageous/qbit/service/ServiceQueue.java b/qbit/core/src/main/java/io/advantageous/qbit/service/ServiceQueue.java
@@ -37,6 +37,16 @@
  */
 public interface ServiceQueue extends Stoppable, ServiceFlushable, Startable {
 
+
+
+    boolean failing();
+
+    void setFailing();
+
+    void recover();
+
+
+
     Object service();
 
     /**

diff --git a/qbit/core/src/main/java/io/advantageous/qbit/service/health/ServiceHealthListener.java b/qbit/core/src/main/java/io/advantageous/qbit/service/health/ServiceHealthListener.java
@@ -1,6 +1,8 @@
 package io.advantageous.qbit.service.health;
 
+import io.advantageous.qbit.annotation.Service;
 import io.advantageous.qbit.queue.QueueCallBackHandler;
+import io.advantageous.qbit.service.ServiceContext;
 import io.advantageous.qbit.util.Timer;
 
 import java.util.concurrent.TimeUnit;
@@ -46,7 +48,14 @@ private void check() {
 
         if (duration > checkInIntervalMS) {
             lastCheckTime = now;
-            healthServiceAsync.checkInOk(serviceName);
+
+            boolean failing = ServiceContext.serviceContext().currentService().failing();
+
+            if (!failing) {
+                healthServiceAsync.checkInOk(serviceName);
+            } else {
+                healthServiceAsync.checkIn(serviceName, HealthStatus.FAIL);
+            }
             healthServiceAsync.clientProxyFlush();
         }
     }

diff --git a/qbit/core/src/main/java/io/advantageous/qbit/service/impl/BaseServiceQueueImpl.java b/qbit/core/src/main/java/io/advantageous/qbit/service/impl/BaseServiceQueueImpl.java
@@ -103,6 +103,7 @@ public class BaseServiceQueueImpl implements ServiceQueue {
     private Transformer<Response<Object>, Response> responseObjectTransformer = new NoOpResponseTransformer();
     private final CallbackManager callbackManager;
     private final QueueCallBackHandler queueCallBackHandler;
+    private final AtomicBoolean failing = new AtomicBoolean();
 
     public BaseServiceQueueImpl(final String rootAddress,
                                 final String serviceAddress,
@@ -576,6 +577,22 @@ public void flush() {
         manageResponseQueue();
     }
 
+
+    @Override
+    public boolean failing() {
+        return failing.get();
+    }
+
+    @Override
+    public void setFailing() {
+        failing.set(true);
+    }
+
+    @Override
+    public void recover() {
+        failing.set(false);
+    }
+
     public Object service() {
         return service;
     }