Replace temporary independent health check process with integrated health check endpoint

Dockerfile

@@ -28,10 +28,5 @@ USER appuser
 # Expose a volume mount for logs ― Hugging Face Spaces requires specifically /data.
 VOLUME /data
 
-# Temporary block for the health server fix:
-COPY scripts/run.sh ./scripts/
-COPY temporary_health_check_server.py ./
-CMD ["./scripts/run.sh"]
-
 # Run the application.
-#CMD ["python", "-m", "ctp_slack_bot.app"]
+CMD ["python", "-m", "ctp_slack_bot.app"]

scripts/run.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-parent_path=$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd -P)
-
-cd "${parent_path}/.."
-
-python -m ctp_slack_bot.app & python "temporary_health_check_server.py"

src/ctp_slack_bot/app.py

@@ -1,3 +1,4 @@
+from aiohttp.web import Application as WebApplication, AppRunner as WebAppRunner, Response, TCPSite
 from asyncio import all_tasks, CancelledError, create_task, current_task, get_running_loop, run
 from loguru import logger
 from signal import SIGINT, SIGTERM
@@ -6,18 +7,6 @@ from typing import Any, Callable
 from ctp_slack_bot.containers import Container
 from ctp_slack_bot.core.logging import setup_logging
 
-async def handle_shutdown_signal() -> None:
-    logger.info("Received shutdown signal.")
-    for task in all_tasks():
-        if task is not current_task() and not task.done():
-            task.cancel()
-            logger.trace("Cancelled task {}.", task.get_name())
-    logger.info("Cancelled all tasks.")
-
-def create_shutdown_signal_handler() -> Callable[[], None]:
-    def shutdown_signal_handler() -> None:
-        create_task(handle_shutdown_signal())
-    return shutdown_signal_handler
 
 async def main() -> None:
     # Setup logging.
@@ -26,13 +15,36 @@ async def main() -> None:
 
     # Set up dependency injection container.
     container = Container()
-    container.wire(packages=['ctp_slack_bot'])
+    container.wire(packages=["ctp_slack_bot"])
 
     # Kick off services which should be active from the start.
     container.content_ingestion_service()
     container.question_dispatch_service()
     container.schedule_service()
 
+    async def health(request):
+        return Response(text="lol")
+    http_server = WebApplication()
+    http_server.router.add_get("/health", health)
+    web_app_runner = WebAppRunner(http_server)
+    await web_app_runner.setup()
+    website = TCPSite(web_app_runner, "0.0.0.0", 8080)
+    await website.start()
+
+    async def handle_shutdown_signal() -> None:
+        logger.info("Received shutdown signal.")
+        await web_app_runner.cleanup()
+        for task in all_tasks():
+            if task is not current_task() and not task.done():
+                task.cancel()
+                logger.trace("Cancelled task {}.", task.get_name())
+        logger.info("Cancelled all tasks.")
+
+    def create_shutdown_signal_handler() -> Callable[[], None]:
+        def shutdown_signal_handler() -> None:
+            create_task(handle_shutdown_signal())
+        return shutdown_signal_handler
+
     # Start the Slack socket mode handler in the background.
     socket_mode_handler = await container.socket_mode_handler()
     slack_bolt_task = create_task(socket_mode_handler.start_async())

temporary_health_check_server.py

@@ -1,11 +0,0 @@
-from aiohttp import web
-
-async def aliveness_handler(request):
-    return web.Response(text="Server is alive and kicking!")
-
-app = web.Application()
-app.router.add_get('/', aliveness_handler)
-app.router.add_get('/health', aliveness_handler)
-
-if __name__ == "__main__":
-    web.run_app(app, host='0.0.0.0', port=8080)