From e156158a3ec705b6ddbb8d4434b45b4daa1c6717 Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Wed, 6 Aug 2025 22:16:46 -0400 Subject: [PATCH] fixse from bot review --- backend/main.py | 14 +++++++------- entrypoint.sh | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/backend/main.py b/backend/main.py index a9711d793..d853b2cfb 100644 --- a/backend/main.py +++ b/backend/main.py @@ -140,13 +140,6 @@ add_pagination(app) if __name__ == "__main__": - # Run migrations - alembic.config.main(argv=["upgrade", "head"]) - - # Run application - app.add_middleware(CustomLoggingMiddleware) - uvicorn.run("main:app", host=DEV_HOST, port=DEV_PORT, reload=True, access_log=False) - # Initialize scheduled tasks if ENABLE_SCHEDULED_RESCAN: log.info("Starting scheduled rescan") @@ -159,3 +152,10 @@ if __name__ == "__main__": if ENABLE_SCHEDULED_UPDATE_LAUNCHBOX_METADATA: log.info("Starting scheduled update launchbox metadata") update_launchbox_metadata_task.init() + + # Run migrations + alembic.config.main(argv=["upgrade", "head"]) + + # Run application + app.add_middleware(CustomLoggingMiddleware) + uvicorn.run("main:app", host=DEV_HOST, port=DEV_PORT, reload=True, access_log=False) diff --git a/entrypoint.sh b/entrypoint.sh index 7a43b05ea..6b7ccaa30 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -44,11 +44,10 @@ RQ_REDIS_HOST=${REDIS_HOST:-127.0.0.1} \ RQ_REDIS_DB=${REDIS_DB:-0} \ RQ_REDIS_SSL=${REDIS_SSL:-0} \ rqscheduler \ - --path /backend \ + --path /app/backend \ --pid /tmp/rq_scheduler.pid & echo "Starting RQ worker..." - # Build Redis URL properly if [[ -n ${REDIS_USERNAME-} && -n ${REDIS_PASSWORD-} ]]; then REDIS_URL="redis${REDIS_SSL:+s}://${REDIS_USERNAME}:${REDIS_PASSWORD}@${REDIS_HOST:-127.0.0.1}:${REDIS_PORT:-6379}/${REDIS_DB:-0}" @@ -59,8 +58,8 @@ else fi # Set PYTHONPATH so RQ can find the tasks module -PYTHONPATH="/backend:${PYTHONPATH-}" rq worker \ - --path /backend \ +PYTHONPATH="/app/backend:${PYTHONPATH-}" rq worker \ + --path /app/backend \ --pid /tmp/rq_worker.pid \ --url "${REDIS_URL}" \ high default low &