flagsmith healthcheck

Author: khvn26

api/poetry.lock

@@ -66,7 +66,13 @@ exclude_also = [
 omit = ["scripts/*", "manage.py"]
 
 [tool.pytest.ini_options]
-addopts = ['--ds=app.settings.test', '-vvvv', '-p', 'no:warnings', '--dist=worksteal']
+addopts = [
+  '--ds=app.settings.test',
+  '-vvvv',
+  '-p',
+  'no:warnings',
+  '--dist=worksteal',
+]
 console_output_style = 'count'
 
 [tool.mypy]
@@ -154,7 +160,7 @@ pygithub = "2.1.1"
 hubspot-api-client = "^8.2.1"
 djangorestframework-dataclasses = "^1.3.1"
 pyotp = "^2.9.0"
-flagsmith-common = "^1.10.0"
+flagsmith-common = { git = "https://github.com/flagsmith/flagsmith-common", branch = "feat/flagsmith-healthcheck" }
 django-stubs = "^5.1.3"
 tzdata = "^2024.1"
 djangorestframework-simplejwt = "^5.3.1"

api/pyproject.toml

@@ -1,32 +1,11 @@
-import argparse
-import socket
-
-parser = argparse.ArgumentParser(
-    description="Check if the API is able to accept local TCP connections.",
-)
-parser.add_argument(
-    "--port",
-    "-p",
-    type=int,
-    default=8000,
-    help="Port to check the API on (default: 8000)",
-)
-parser.add_argument(
-    "--timeout",
-    "-t",
-    type=int,
-    default=1,
-    help="Socket timeout for the connection attempt in seconds (default: 1)",
-)
-
-
-def main() -> None:
-    args = parser.parse_args()
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sock.settimeout(args.timeout)
-    sock.connect(("localhost", args.port))
-    sock.close()
+import logging
+import sys
 
+from common.core.main import main
 
 if __name__ == "__main__":
-    main()
+    logging.getLogger(__name__).warning(
+        f"This healthcheck, invoked by `{' '.join(sys.argv)}``, is deprecated. "
+        "Please use one of the `flagsmith healthcheck` commands instead."
+    )
+    main(["flagsmith", "healthcheck", "http"])

api/scripts/healthcheck.py

@@ -19,7 +19,7 @@
             "healthCheck": {
                 "command": [
                     "CMD-SHELL",
-                    "python scripts/healthcheck.py"
+                    "flagsmith healthcheck tcp"
                 ],
                 "interval": 10,
                 "timeout": 2,

infrastructure/aws/staging/ecs-task-definition-task-processor.json

@@ -20,7 +20,7 @@
             "healthCheck": {
                 "command": [
                     "CMD-SHELL",
-                    "python scripts/healthcheck.py"
+                    "flagsmith healthcheck tcp"
                 ],
                 "interval": 10,
                 "timeout": 2,