Adds db connectivity check to status (#150)

* Adds db connectivity check to status * Changes healthcheck implementation
criteo · Aug 23, 2017 · 0186ace · 0186ace
1 parent 4091d08
commit 0186ace
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/core/src/main/scala/com/criteo/cuttle/App.scala b/core/src/main/scala/com/criteo/cuttle/App.scala
@@ -141,13 +141,17 @@ private[cuttle] case class App[S <: Scheduling](project: CuttleProject[S], execu
 
   val publicApi: PartialService = {
 
-    case GET at url"/api/status" =>
-      Ok(
-        Json.obj(
-          "project" -> project.name.asJson,
-          "version" -> Option(project.version).filterNot(_.isEmpty).asJson,
-          "status" -> "ok".asJson
-        ))
+    case GET at url"/api/status" => {
+      val projectJson = (status : String) => Json.obj(
+        "project" -> project.name.asJson,
+        "version" -> Option(project.version).filterNot(_.isEmpty).asJson,
+        "status" -> status.asJson
+      )
+      executor.healthCheck() match {
+        case Success(_) => Ok(projectJson("ok"))
+        case _ => InternalServerError(projectJson("ko"))
+      }
+    }
 
     case GET at url"/api/statistics?events=$events&jobs=$jobs" =>
       val filteredJobs = Try(jobs.split(",").toSeq.filter(_.nonEmpty)).toOption

diff --git a/core/src/main/scala/com/criteo/cuttle/Database.scala b/core/src/main/scala/com/criteo/cuttle/Database.scala
@@ -227,5 +227,10 @@ private[cuttle] trait Queries {
               new ExecutionStat(startTime, endTime, durationSeconds, waitingSeconds, status)
           })
   }
+
+  val healthCheck : ConnectionIO[Boolean] =
+      sql"""select 1 from dual"""
+        .query[Boolean]
+        .unique
 }
 
diff --git a/core/src/main/scala/com/criteo/cuttle/Executor.scala b/core/src/main/scala/com/criteo/cuttle/Executor.scala
@@ -5,7 +5,7 @@ import java.util.{Timer, TimerTask}
 import java.util.concurrent.atomic.AtomicBoolean
 import java.time.{Duration, Instant, ZoneId}
 
-import scala.util.{Failure, Success}
+import scala.util.{Failure, Success, Try}
 import scala.concurrent.{ExecutionContext, Future, Promise}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.stm._
@@ -570,4 +570,7 @@ class Executor[S <: Scheduling] private[cuttle] (
         .foreach({ case (e, _) => e.updateWaitingTime(intervalSeconds) })
     }
   }
+
+  private[cuttle] def healthCheck(): Try[Boolean] =
+    Try(queries.healthCheck.transact(xa).unsafePerformIO)
 }