From 35ef010ba9a33776e858d1116dce568ce5a9c41e Mon Sep 17 00:00:00 2001
From: Hayden Young <hi@hbjy.dev>
Date: Thu, 14 Oct 2021 18:47:05 +0100
Subject: [PATCH] feat: implement a database check on the healthz and readyz
 probes, remove /-/metrics

---
 api/src/routes/-/healthz.ts |  9 ++++++++-
 api/src/routes/-/metrics.ts | 10 ----------
 api/src/routes/-/readyz.ts  |  9 ++++++++-
 3 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 api/src/routes/-/metrics.ts

diff --git a/api/src/routes/-/healthz.ts b/api/src/routes/-/healthz.ts
index bfd98a22..a42575f8 100644
--- a/api/src/routes/-/healthz.ts
+++ b/api/src/routes/-/healthz.ts
@@ -1,10 +1,17 @@
 import { Router, Response, Request } from "express";
 import { route } from "@fosscord/api";
+import { getConnection } from "typeorm";
 
 const router = Router();
 
 router.get("/", route({}), (req: Request, res: Response) => {
-	res.sendStatus(200);
+	try {
+		// test that the database is alive & responding
+		getConnection();
+		return res.sendStatus(200);
+	} catch(e) {
+		res.sendStatus(503);
+	}
 });
 
 export default router;
diff --git a/api/src/routes/-/metrics.ts b/api/src/routes/-/metrics.ts
deleted file mode 100644
index bfd98a22..00000000
--- a/api/src/routes/-/metrics.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Router, Response, Request } from "express";
-import { route } from "@fosscord/api";
-
-const router = Router();
-
-router.get("/", route({}), (req: Request, res: Response) => {
-	res.sendStatus(200);
-});
-
-export default router;
diff --git a/api/src/routes/-/readyz.ts b/api/src/routes/-/readyz.ts
index bfd98a22..a42575f8 100644
--- a/api/src/routes/-/readyz.ts
+++ b/api/src/routes/-/readyz.ts
@@ -1,10 +1,17 @@
 import { Router, Response, Request } from "express";
 import { route } from "@fosscord/api";
+import { getConnection } from "typeorm";
 
 const router = Router();
 
 router.get("/", route({}), (req: Request, res: Response) => {
-	res.sendStatus(200);
+	try {
+		// test that the database is alive & responding
+		getConnection();
+		return res.sendStatus(200);
+	} catch(e) {
+		res.sendStatus(503);
+	}
 });
 
 export default router;