Change healthcheck API to report open circuits but return "GREEN" any…

…ways
m3dev · Apr 8, 2015 · 93bf175 · 93bf175
1 parent acbbffe
commit 93bf175
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/system/HealthcheckController.scala b/app/controllers/system/HealthcheckController.scala
@@ -45,7 +45,7 @@ class HealthcheckController(configsRepo: ConfigsRepository,
           "hystrix" -> hystrixStatus,
           "memcached" -> memcachedStatus
         )
-        val colour = calculateColour(statuses.values)
+        val colour = calculateColour(statuses.filterKeys(_ != "hystrix").values)
         val health = ServiceHealth(colour, statuses)
         logIfUnhealthy(health)
         health

diff --git a/test/controllers/system/HealthcheckControllerSpec.scala b/test/controllers/system/HealthcheckControllerSpec.scala
@@ -80,11 +80,12 @@ class HealthcheckControllerSpec
       }
     }
 
-    it should "be YELLOW and show Hystrix as not OK if there are any open Hystrix circuits" in {
+    it should "be GREEN and show Hystrix as not OK if there are any open Hystrix circuits" in {
       when(hystrixHealthReporter.getCommandKeysWithOpenCircuitBreakers).thenReturn(Seq("mrkun", "career"))
 
       checkJson(controller.healthcheck.apply(FakeRequest())) { implicit json =>
-        colour should be("YELLOW")
+        // https://github.com/m3dev/octoparts/pull/150
+        colour should be("GREEN")
         hystrixOk shouldBe false
       }
     }