Upgraded modules
This commit is contained in:
florian committed
1 parent
7fe86164a8
commit
92dc1f3ce7
6 files changed
+95
-146
No files matched your search
+60
-53
@@ -9,22 +9,21 @@ from dockerhub_api import find_package_version_with_tag as find_package_version_
|
||||
from github_api import find_package_version_with_tag as find_package_version_with_tag_github
|
||||
from metrics_server import REQUEST_COUNTER
|
||||
from secret_manager import cleanup_secret_files
|
||||
from send_notification import send_notification
|
||||
from send_notifications import NotificationClient
|
||||
from simple_logger_handler import LOG_LEVEL, setup_logger
|
||||
from uvicorn_logger_config import LOGGING_CONFIG
|
||||
|
||||
logger = setup_logger(__name__)
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
logger.info("[App] Starting application...")
|
||||
|
||||
logger.info("[DB] Creating MySQL connection pool...")
|
||||
logger.info("[FastAPI] Starting application...")
|
||||
app.state.notifier = NotificationClient()
|
||||
logger.info("[FastAPI] Creating MySQL connection pool...")
|
||||
create_connection_pool("repositoryQueryPool")
|
||||
|
||||
start_healthcheck_thread()
|
||||
logger.info("[DB] MySQL healthcheck thread started.")
|
||||
logger.info("[FastAPI] MySQL healthcheck thread started.")
|
||||
|
||||
SECRET_PATHS = frozenset({
|
||||
"/etc/secrets/api_key",
|
||||
@@ -37,9 +36,9 @@ async def lifespan(app: FastAPI):
|
||||
cleanup_secret_files(SECRET_PATHS)
|
||||
|
||||
yield
|
||||
logger.info("[App] Closing MySQL connection pool...")
|
||||
logger.info("[FastAPI] Closing MySQL connection pool...")
|
||||
close_connection_pool()
|
||||
logger.info("[App] Shutdown complete.")
|
||||
logger.info("[FastAPI] Shutdown complete.")
|
||||
|
||||
|
||||
api = FastAPI(
|
||||
@@ -51,18 +50,18 @@ api = FastAPI(
|
||||
|
||||
@api.middleware("http")
|
||||
async def prometheus_middleware(request: Request, call_next):
|
||||
logger.debug(f"[Metrics] Incoming request: {request.method} {request.url.path}")
|
||||
logger.debug(f"[FastAPI] 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}")
|
||||
logger.debug(f"[FastAPI] Request processed with status {status}")
|
||||
except Exception as e:
|
||||
logger.error(f"[Metrics] Exception occurred: {e}", exc_info=True)
|
||||
logger.error(f"[FastAPI] 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}]")
|
||||
logger.debug(f"[FastAPI] Counter incremented for {request.method} {request.url.path} [{status}]")
|
||||
return response
|
||||
|
||||
|
||||
@@ -79,31 +78,35 @@ def handle_suwayomi(
|
||||
):
|
||||
|
||||
try:
|
||||
logger.info("[App] Suwayomi handler invoked")
|
||||
logger.info("[FastAPI] Suwayomi handler invoked")
|
||||
online_version = find_package_version_with_tag_github("Suwayomi", "tachidesk", "stable")
|
||||
logger.debug(f"[App] Fetched latest Suwayomi version from GitHub: {online_version}")
|
||||
logger.debug(f"[FastAPI] Fetched latest Suwayomi version from GitHub: {online_version}")
|
||||
|
||||
cursor = db.cursor()
|
||||
cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='suwayomi'")
|
||||
local_state = cursor.fetchone()
|
||||
local_version = str(local_state[0]) if local_state and local_state[0] is not None else None
|
||||
logger.debug(f"[App] Comparing versions: local='{local_version}' vs online='{online_version}'")
|
||||
with db.cursor() as cursor:
|
||||
cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='suwayomi'")
|
||||
local_state = cursor.fetchone()
|
||||
local_version = str(local_state[0]) if local_state and local_state[0] is not None else None
|
||||
logger.debug(f"[FastAPI] Comparing versions: local='{local_version}' vs online='{online_version}'")
|
||||
|
||||
if local_version != online_version:
|
||||
logger.debug("[App] Version mismatch detected. Updating database.")
|
||||
cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='suwayomi'",
|
||||
(online_version,))
|
||||
db.commit()
|
||||
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)
|
||||
if local_version != online_version:
|
||||
logger.debug("[FastAPI] Version mismatch detected. Updating database.")
|
||||
cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='suwayomi'",
|
||||
(online_version,))
|
||||
db.commit()
|
||||
logger.info("[FastAPI] New Suwayomi version recorded in database")
|
||||
request.app.state.notifier.send(
|
||||
title="New Suwayomi version has been found",
|
||||
body=f"Version {online_version}",
|
||||
category="utility"
|
||||
)
|
||||
logger.debug("[FastAPI] Notification sent for Suwayomi update")
|
||||
return Response(status_code=200)
|
||||
|
||||
logger.debug("[App] No new Suwayomi version found")
|
||||
logger.debug("[FastAPI] 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)
|
||||
logger.error(f"[FastAPI] Error in Suwayomi handler: {e}", exc_info=True)
|
||||
raise HTTPException(status_code=500, detail=str(e)) from e
|
||||
|
||||
|
||||
@@ -114,44 +117,48 @@ def handle_pihole(
|
||||
db = Depends(get_db)
|
||||
):
|
||||
try:
|
||||
logger.info("[App] Pi-hole handler invoked")
|
||||
logger.info("[FastAPI] Pi-hole handler invoked")
|
||||
online_version = find_package_version_with_tag_dockerhub("pihole/pihole", "latest")
|
||||
logger.debug(f"Fetched latest Pi-hole version from Docker Hub: {online_version}")
|
||||
logger.debug(f"[FastAPI] Fetched latest Pi-hole version from Docker Hub: {online_version}")
|
||||
|
||||
cursor = db.cursor()
|
||||
cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='pihole'")
|
||||
local_state = cursor.fetchone()
|
||||
local_version = str(local_state[0]) if local_state and local_state[0] is not None else None
|
||||
logger.debug(f"[App] Comparing versions: local='{local_version}' vs online='{online_version}'")
|
||||
with db.cursor() as cursor:
|
||||
cursor.execute("SELECT latest_version FROM docker_repositories WHERE app='pihole'")
|
||||
local_state = cursor.fetchone()
|
||||
local_version = str(local_state[0]) if local_state and local_state[0] is not None else None
|
||||
logger.debug(f"[FastAPI] Comparing versions: local='{local_version}' vs online='{online_version}'")
|
||||
|
||||
if local_version != online_version:
|
||||
logger.debug("[App] Version mismatch detected. Updating database.")
|
||||
cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='pihole'",
|
||||
(online_version,))
|
||||
db.commit()
|
||||
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)
|
||||
if local_version != online_version:
|
||||
logger.debug("[FastAPI] Version mismatch detected. Updating database.")
|
||||
cursor.execute ("UPDATE docker_repositories SET latest_version=%s WHERE app='pihole'",
|
||||
(online_version,))
|
||||
db.commit()
|
||||
logger.info("[FastAPI] New Pi-hole version recorded in database")
|
||||
request.app.state.notifier.send(
|
||||
title="New Pi-hole version has been found",
|
||||
body=f"Version {online_version}",
|
||||
category="utility"
|
||||
)
|
||||
logger.debug("[FastAPI] Notification sent for Pi-hole update")
|
||||
return Response(status_code=200)
|
||||
|
||||
logger.debug("[App] No new Pi-hole version found")
|
||||
logger.debug("[FastAPI] 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)
|
||||
logger.error(f"[FastAPI] Error in Pi-hole handler: {e}", exc_info=True)
|
||||
raise HTTPException(status_code=500, detail=str(e)) from e
|
||||
|
||||
|
||||
async def start_servers():
|
||||
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(), log_config=LOGGING_CONFIG)
|
||||
config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=LOGGING_CONFIG)
|
||||
logger.info("[Server] Starting main and metrics servers")
|
||||
config_main = uvicorn.Config("main:api", host="0.0.0.0", port=5000, log_level=LOG_LEVEL.lower(), log_config=None)
|
||||
config_metrics = uvicorn.Config("metrics_server:metrics_api", host="0.0.0.0", port=9000, log_level=LOG_LEVEL.lower(), log_config=None)
|
||||
|
||||
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")
|
||||
logger.info("[Server] Both servers have stopped")
|
||||
|
||||
if __name__ == "__main__":
|
||||
asyncio.run(start_servers())
|
||||
Reference in new issue
Block a user