Unified log levels

- Logger doesn't start with log level DEBUG by default, instead reads a environment variable
- Secret handler raises exceptions instead of using the module os to exit
- Added extensive debug logging
- Notifications: Added timestamp and category

src/main.py

@@ -5,26 +5,29 @@ from dockerhub_api import find_package_version_with_tag as find_package_version_
 import uvicorn
 from contextlib import asynccontextmanager
 from db import get_db, create_connection_pool, close_connection_pool, start_healthcheck_thread
-import logging
+from logger_handler import setup_logger, LOG_LEVEL
 from send_notification import send_notification
 from metrics_server import REQUEST_COUNTER
 import asyncio
 
-logger = logging.getLogger(__name__)
+logger = setup_logger(__name__)
+
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-	logger.info("Starting application...")
+	logger.info("[App] Starting application...")
 
-	logger.info("Creating MySQL connection pool...")
+	logger.info("[DB] Creating MySQL connection pool...")
 	create_connection_pool()
 
 	start_healthcheck_thread()
-	logger.info("MySQL healthcheck thread started.")
+	logger.info("[DB] MySQL healthcheck thread started.")
 
 	yield
-	logger.info("Closing MySQL connection pool...")
+	logger.info("[App] Closing MySQL connection pool...")
 	close_connection_pool()
+	logger.info("[App] Shutdown complete.")
+
 
 api = FastAPI(
 		title="Docker Repository Query",
@@ -35,17 +38,22 @@ api = FastAPI(
 
 @api.middleware("http")
 async def prometheus_middleware(request: Request, call_next):
+	logger.debug(f"[Metrics] Incoming request: {request.method} {request.url.path}")
+	status = 500
 	try:
 		response = await call_next(request)
 		status = response.status_code
+		logger.debug(f"[Metrics] Request processed with status {status}")
 	except Exception:
-		status = 500
+		logger.error(f"[Metrics] Exception occurred: {e}", exc_info=True)
 		raise
 	finally:
 		REQUEST_COUNTER.labels(request.method, request.url.path, status).inc()
+		logger.debug(f"[Metrics] Counter incremented for {request.method} {request.url.path} [{status}]")
 	return response
 
 
+
 @api.get("/health")
 def return_health():
 	return Response(status_code=200)
@@ -58,22 +66,30 @@ def handle_suwayomi(
 		):
 
 	try:
-		logger.info("Suwayomi handler invoked")
+		logger.info("[App] Suwayomi handler invoked")
 		latest_online_version = find_package_version_with_tag_github("Suwayomi", "tachidesk", "stable")
+		logger.debug(f"[App] Fetched latest Suwayomi version from GitHub: {latest_online_version}")
 
 		cursor = db.cursor()
 		cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='suwayomi'")
 		local_state = cursor.fetchone()
+		logger.debug(f"[App] Local Suwayomi version from DB: {local_state}")
 
 		if local_state and latest_online_version != local_state[0]:
+			logger.debug("[App] Version mismatch detected. Updating database.")
 			cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='suwayomi'",
-				    (latest_online_version,))
+				(latest_online_version,))
 			db.commit()
-			logger.info("New Suwayomi version has been found")
+			logger.info("[App] New Suwayomi version recorded in database")
 			send_notification("New Suwayomi version has been found")
+			logger.debug("[App] Notification sent for Suwayomi update")
 			return Response(status_code=200)
+
+		logger.debug("[App] No new Suwayomi version found")
 		return Response(status_code=204)
+
 	except Exception as e:
+		logger.error(f"[App] Error in Suwayomi handler: {e}", exc_info=True)
 		raise HTTPException(status_code=500, detail=str(e))
 
 
@@ -84,33 +100,43 @@ def handle_pihole(
 		db = Depends(get_db)
 		):
 	try:
-		logger.info("Pi-hole handler invoked")
+		logger.info("[App] Pi-hole handler invoked")
 		latest_online_version = find_package_version_with_tag_dockerhub("pihole/pihole", "latest")
-		
+		logger.debug(f"Fetched latest Pi-hole version from Docker Hub: {latest_online_version}")
+
 		cursor = db.cursor()
 		cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='pihole'")
 		local_state = cursor.fetchone()
+		logger.debug(f"[App] Local Pi-hole version from DB: {local_state}")
 
 		if local_state and latest_online_version != local_state[0]:
+			logger.debug("[App] Version mismatch detected. Updating database.")
 			cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='pihole'",
 					(latest_online_version,))
 			db.commit()
-			logger.info("New Pi-hole version has been found")
+			logger.info("[App] New Pi-hole version recorded in database")
 			send_notification("New Pi-hole version has been found")
+			logger.debug("[App] Notification sent for Pi-hole update")
 			return Response(status_code=200)
+
+		logger.debug("[App] No new Pi-hole version found")
 		return Response(status_code=204)
+
 	except Exception as e:
+		logger.error(f"[App] Error in Pi-hole handler: {e}", exc_info=True)
 		raise HTTPException(status_code=500, detail=str(e))
 
 
 async def start_servers():
-	config_main = uvicorn.Config("main:api", host="0.0.0.0", port=5000, log_level="info")
-	config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level="info")
+	logger.info("Starting main and metrics servers")
+	config_main = uvicorn.Config("main:api", host="0.0.0.0", port=5000, log_level=LOG_LEVEL.lower())
+	config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower())
 
 	server_main = uvicorn.Server(config_main)
 	server_metrics = uvicorn.Server(config_metrics)
-
+	logger.debug("Launching servers concurrently")
 	await asyncio.gather(server_main.serve(), server_metrics.serve())
+	logger.info("Both servers have stopped")
 
 if __name__ == "__main__":
 	asyncio.run(start_servers())