diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml index 20e2223..80e0af2 100644 --- a/.deploy/deploy-dev.yaml +++ b/.deploy/deploy-dev.yaml @@ -9,8 +9,6 @@ services: environment: MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_DEV - REDIS_HOST: "redis.develop.sprinthub.ru" - REDIS_PASSWORD: $REDIS_PASSWORD_DEV deploy: mode: replicated restart_policy: diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml index b01f4c6..1e94afa 100644 --- a/.deploy/deploy-prod.yaml +++ b/.deploy/deploy-prod.yaml @@ -9,8 +9,6 @@ services: environment: MONGO_HOST: "mongo.sprinthub.ru" MONGO_PASSWORD: $MONGO_PASSWORD_PROD - REDIS_HOST: "redis.sprinthub.ru" - REDIS_PASSWORD: $REDIS_PASSWORD_PROD deploy: mode: replicated restart_policy: diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 843315a..3efe3ac 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -40,5 +40,4 @@ jobs: - name: deploy env: MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} - REDIS_PASSWORD_DEV: ${{ secrets.REDIS_PASSWORD_DEV }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml infra-development diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 4ce27eb..9a6c82f 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -40,5 +40,4 @@ jobs: - name: deploy env: MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }} - REDIS_PASSWORD_PROD: ${{ secrets.REDIS_PASSWORD_PROD }} run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml infra diff --git a/app/routers/take.py b/app/routers/take.py index 34cddb4..f0cd112 100644 --- a/app/routers/take.py +++ b/app/routers/take.py @@ -17,8 +17,7 @@ class Response(pydantic.BaseModel): @router.get('/api/v1/take', responses={404: {'description': 'Not found'}}) async def execute(queue: typing.Annotated[str, fastapi.Header()]) -> Response: - async with redis.database.lock(queue): - task = await tasks.take_task(queue) + task = await tasks.take_task(queue) if not task: raise fastapi.HTTPException(404) return Response(id=str(task._id), attempt=task.attempts, payload=task.payload) diff --git a/app/storage/redis/__init__.py b/app/storage/redis/__init__.py deleted file mode 100644 index fdffabb..0000000 --- a/app/storage/redis/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -import os -import redis.asyncio as connection - - -REDIS_HOST = os.getenv('REDIS_HOST', 'localhost') -REDIS_PASSWORD = os.getenv('REDIS_PASSWORD') - - -database = connection.Redis(host=REDIS_HOST, password=REDIS_PASSWORD)