From 61deda0d8fa75cc3e56f1512d58d2a3066dd8c26 Mon Sep 17 00:00:00 2001
From: ting <thetingzhang@gmail.com>
Date: Fri, 8 Apr 2022 17:05:06 -0400
Subject: [PATCH] Health handler pings db (#43)

* [add] db check to health handler

* [change] set dev instances to 3

* [add] simplify dev deploy task

* [change] simplify health logic

* [change] make low-cost db query in health handler
---
 Karfile              | 14 ++++++++++----
 README.md            |  2 +-
 app.py               | 10 ----------
 cdk/lib/app-stack.ts |  2 +-
 handlers/base.py     | 11 +++++++++++
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Karfile b/Karfile
index e91e0e7..a5603c0 100644
--- a/Karfile
+++ b/Karfile
@@ -10,10 +10,16 @@ DOCKER_OPTS=$(cat <<END_HEREDOC
 END_HEREDOC
 )
 
-#@cdk
-#+Run cdk.
-task-cdk() {
-    (cd cdk && npx cdk $@)
+#@deploy
+#+CDK deploy.
+task-deploy() {
+    echo "Deploying all dev stacks..."
+    cd cdk
+    for stack in $(npx cdk list | grep Dev)
+    do
+        npx cdk deploy $stack
+    done
+    cd ..
 }
 
 #@build
diff --git a/README.md b/README.md
index 4d09a03..06e4450 100644
--- a/README.md
+++ b/README.md
@@ -162,7 +162,7 @@ kar test
 For dev deployment, run:
 
 ```
-kar cdk deploy DevArticleRecAPI
+kar deploy
 ```
 
 Each pull request to main will trigger a new prod deployment when merged.
diff --git a/app.py b/app.py
index 07a1a00..ccfb446 100644
--- a/app.py
+++ b/app.py
@@ -65,15 +65,6 @@ async def empty_metric_buffers():
                 )
 
 
-async def restart_db_connection():
-    INTERVAL_MIN = 1
-    while True:
-        await asyncio.sleep(INTERVAL_MIN * 60)
-        if db_proxy.is_closed():
-            logging.info("Resetting db conn...")
-            db_proxy.connect()
-
-
 if __name__ == "__main__":
     if config.get("DEBUG") is True:
         tornado.autoreload.start()
@@ -90,5 +81,4 @@ async def restart_db_connection():
     http_server.listen(port)
     io_loop = tornado.ioloop.IOLoop.current()
     io_loop.add_callback(empty_metric_buffers)
-    io_loop.add_callback(restart_db_connection)
     io_loop.start()
diff --git a/cdk/lib/app-stack.ts b/cdk/lib/app-stack.ts
index 5e11774..956bdd1 100644
--- a/cdk/lib/app-stack.ts
+++ b/cdk/lib/app-stack.ts
@@ -77,7 +77,7 @@ export class AppStack extends cdk.Stack {
       cluster,
       cpu: 256,
       memoryLimitMiB: 256,
-      desiredCount: props.stage === helpers.STAGE.PRODUCTION  ? 3 : 1,
+      desiredCount: 3,
       domainName,
       domainZone,
       certificate,
diff --git a/handlers/base.py b/handlers/base.py
index 6b2f59e..65dc7bb 100644
--- a/handlers/base.py
+++ b/handlers/base.py
@@ -12,6 +12,8 @@
 
 from lib.metrics import write_metric, Unit
 from lib.config import config
+from db.mappings.model import Model
+
 
 DEFAULT_PAGE_SIZE = config.get("DEFAULT_PAGE_SIZE")
 # buffer of latency values for each handler/site combination
@@ -104,6 +106,8 @@ def push_latency(self, latency, handler_name: str, site_name: str) -> None:
             LATENCY_BUFFERS[key].push(latency)
 
     def on_finish(self):
+        if self.handler_name == "Health":
+            return
         latency = (time.time() - self.start_time) * 1000
         if not 200 <= self._status_code < 300:
             self.write_error_metric(latency)
@@ -124,6 +128,13 @@ class HealthHandler(BaseHandler):
     """Return 200 OK."""
 
     def get(self):
+        try:
+            Model.select().limit(1).count()
+        except:
+            msg = "Can't connect to db"
+            logging.exception(msg)
+            raise tornado.web.HTTPError(status_code=500, log_message=msg)
+
         self.finish("OK")