Admin/fquiz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove scheduler service and unify celery dispatch

Browse Source
This commit is contained in:
chengkai3
2026-05-02 10:18:40 +08:00
parent a4f2debabc
commit cf0a5c978e
13 changed files with 56 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/main.yml
-39
View File
@@ -242,9 +242,6 @@ jobs:
CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND:-redis://redis:6379/1}
CELERY_TIMEZONE: ${CELERY_TIMEZONE:-Asia/Shanghai}
SCHEDULER_EXPIRE_INTERVAL_SECONDS: ${SCHEDULER_EXPIRE_INTERVAL_SECONDS:-60}
SCHEDULER_API_BASE_URL: ${SCHEDULER_API_BASE_URL:-http://scheduler:19100}
SCHEDULER_API_TOKEN: ${SCHEDULER_API_TOKEN:-}
SCHEDULER_DEFAULT_QUEUE: ${SCHEDULER_DEFAULT_QUEUE:-default}
WINE_BINARY_PATH: ${WINE_BINARY_PATH:-wine}
WINE_ALLOWED_ROOT: ${WINE_ALLOWED_ROOT:-./data/wine}
WINE_DEFAULT_TIMEOUT_SECONDS: ${WINE_DEFAULT_TIMEOUT_SECONDS:-300}
@@ -293,9 +290,6 @@ jobs:
CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND:-redis://redis:6379/1}
CELERY_TIMEZONE: ${CELERY_TIMEZONE:-Asia/Shanghai}
SCHEDULER_EXPIRE_INTERVAL_SECONDS: ${SCHEDULER_EXPIRE_INTERVAL_SECONDS:-60}
SCHEDULER_API_BASE_URL: ${SCHEDULER_API_BASE_URL:-http://scheduler:19100}
SCHEDULER_API_TOKEN: ${SCHEDULER_API_TOKEN:-}
SCHEDULER_DEFAULT_QUEUE: ${SCHEDULER_DEFAULT_QUEUE:-default}
FLOWER_API_BASE_URL: ${FLOWER_API_BASE_URL:-http://flower:5555}
FLOWER_API_TIMEOUT_SECONDS: ${FLOWER_API_TIMEOUT_SECONDS:-10}
FLOWER_BASIC_AUTH: ${FLOWER_BASIC_AUTH:-admin:admin}
@@ -332,37 +326,9 @@ jobs:
CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND:-redis://redis:6379/1}
CELERY_TIMEZONE: ${CELERY_TIMEZONE:-Asia/Shanghai}
SCHEDULER_EXPIRE_INTERVAL_SECONDS: ${SCHEDULER_EXPIRE_INTERVAL_SECONDS:-60}
SCHEDULER_API_BASE_URL: ${SCHEDULER_API_BASE_URL:-http://scheduler:19100}
SCHEDULER_API_TOKEN: ${SCHEDULER_API_TOKEN:-}
SCHEDULER_DEFAULT_QUEUE: ${SCHEDULER_DEFAULT_QUEUE:-default}
WORKER_REGISTRY_TTL_SECONDS: ${WORKER_REGISTRY_TTL_SECONDS:-90}
restart: unless-stopped
scheduler:
image: ${API_IMAGE}
container_name: fquiz-scheduler
command:
- uvicorn
- app.scheduler_main:app
- --host
- 0.0.0.0
- --port
- "19100"
depends_on:
redis:
condition: service_healthy
api:
condition: service_healthy
environment:
CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis:6379/0}
CELERY_RESULT_BACKEND: ${CELERY_RESULT_BACKEND:-redis://redis:6379/1}
CELERY_TIMEZONE: ${CELERY_TIMEZONE:-Asia/Shanghai}
SCHEDULER_API_TOKEN: ${SCHEDULER_API_TOKEN:-}
SCHEDULER_DEFAULT_QUEUE: ${SCHEDULER_DEFAULT_QUEUE:-default}
ports:
- "${SCHEDULER_PORT:-19100}:19100"
restart: unless-stopped
flower:
image: ${API_IMAGE}
container_name: fquiz-flower
@@ -449,10 +415,6 @@ jobs:
CELERY_WORKER_CONCURRENCY=2
CELERY_WORKER_QUEUES=default,celery
SCHEDULER_EXPIRE_INTERVAL_SECONDS=60
SCHEDULER_API_BASE_URL=http://scheduler:19100
SCHEDULER_API_TOKEN=
SCHEDULER_DEFAULT_QUEUE=default
SCHEDULER_PORT=19100
FLOWER_API_BASE_URL=http://flower:5555
FLOWER_API_TIMEOUT_SECONDS=10
FLOWER_BASIC_AUTH=admin:admin
@@ -539,7 +501,6 @@ jobs:
docker logs --tail 200 fquiz-redis || true
docker logs --tail 200 fquiz-celery-worker || true
docker logs --tail 200 fquiz-celery-beat || true
docker logs --tail 200 fquiz-scheduler || true
docker logs --tail 200 fquiz-flower || true
exit 1
fi