starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-03-21 17:09:24 +01:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

build: replace celery with procrastinate

Browse Source
This commit is contained in:
Herculino Trotta
2024-10-11 14:11:40 -03:00
parent c9ae8c9db5
commit 49db2089e8
18 changed files with 32 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.env.example
View File

@@ -1,10 +1,7 @@
COMPOSE_FILE=
SERVER_NAME=
DB_NAME=
REDIS_NAME=
CELERYWORKER_NAME=
CELERYBEAT_NAME=
FLOWER_NAME=
PROCRASTINATE_NAME=
DEBUG=true
URL = https://mais.alcanceconsulting.com.br
@@ -20,24 +17,11 @@ SQL_PASSWORD=
SQL_HOST=alcance_mais_pg
SQL_PORT=5432
BREVO_API_KEY=
MINIO_ACCESS_KEY=
MINIO_ENDPOINT=
MINIO_SECRET_KEY=
MINIO_CONTAS_AVATARS_BUCKET=
MINIO_ENTREGAVEIS_BUCKET=
MINIO_CLIENTES_LOGOS_BUCKET=
# Recaptcha
RECAPTCHA_PRIVATE_KEY=
RECAPTCHA_PUBLIC_KEY=
RECAPTCHA_REQUIRED_SCORE=0.6
# Celery
CELERY_BROKER_URL=redis://${REDIS_NAME}
CELERY_FLOWER_USER=
CELERY_FLOWER_PASSWORD=
# Gunicorn
WEB_CONCURRENCY=4

3
app/WYGIWYH/__init__.py
View File

@@ -1,3 +0,0 @@
from .celery import app as celery_app
__all__ = ("celery_app",)

7
app/WYGIWYH/celery.py
View File

@@ -1,7 +0,0 @@
import os
from celery import Celery
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "WYGIWYH.settings")
app = Celery("WYGIWYH")
app.config_from_object("django.conf:settings", namespace="CELERY")
app.autodiscover_tasks()

9
app/WYGIWYH/settings.py
View File

@@ -56,7 +56,7 @@ INSTALLED_APPS = [
"django_tables2",
"django_filters",
"apps.users.apps.UsersConfig",
"django_celery_beat",
"procrastinate.contrib.django",
"apps.transactions.apps.TransactionsConfig",
"apps.currencies.apps.CurrenciesConfig",
"apps.accounts.apps.AccountsConfig",
@@ -199,13 +199,6 @@ LOGIN_URL = "/login/"
CRISPY_ALLOWED_TEMPLATE_PACKS = ["bootstrap5", "crispy_forms/pure_text"]
CRISPY_TEMPLATE_PACK = "bootstrap5"
# Celery settings
CELERY_BROKER_URL = os.getenv("CELERY_BROKER_URL", "redis://redis")
CELERY_RESULT_BACKEND = os.getenv("CELERY_BROKER_URL", "redis://redis")
REDIS_URL = os.getenv("CELERY_BROKER_URL", "redis://redis")
CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
SESSION_EXPIRE_AT_BROWSER_CLOSE = False
SESSION_COOKIE_AGE = int(os.getenv("SESSION_EXPIRY_TIME", 2678400)) # 31 days
SESSION_COOKIE_SECURE = os.getenv("HTTPS_ENABLED", "false").lower() == "true"

2
app/apps/transactions/views/transactions.py
View File

@@ -18,7 +18,7 @@ from apps.transactions.models import Transaction
@only_htmx
@login_required
@require_http_methods(["GET", "POST"])
def transaction_add(request, **kwargs):
def transaction_add(request):
month = int(request.GET.get("month", timezone.localdate(timezone.now()).month))
year = int(request.GET.get("year", timezone.localdate(timezone.now()).year))
transaction_type = Transaction.Type(request.GET.get("type", "IN"))

34
docker-compose.dev.yml
View File

@@ -56,38 +56,12 @@ services:
- '${SQL_PORT}:5432'
restart: unless-stopped
redis:
image: docker.io/redis:6
restart: unless-stopped
container_name: wygiwyh_dev_redis
celeryworker:
procrastinate:
<<: *django
image: wygiwyh_dev_celeryworker
container_name: wygiwyh_dev_celeryworker
image: wygiwyh_dev_procrastinate
container_name: wygiwyh_dev_procrastinate
depends_on:
- redis
- db
ports: [ ]
command: /start-celeryworker
restart: unless-stopped
celerybeat:
<<: *django
image: wygiwyh_dev_celerybeat
container_name: wygiwyh_dev_celerybeat
depends_on:
- redis
- db
ports: [ ]
command: /start-celerybeat
restart: unless-stopped
flower:
<<: *django
image: wygiwyh_dev_flower
container_name: wygiwyh_dev_flower
ports:
- '${FLOWER_OUTBOUND_PORT}:5555'
command: /start-flower
command: /start-procrastinate
restart: unless-stopped

52
docker-compose.prod.yml
View File

@@ -37,59 +37,15 @@ services:
- POSTGRES_PASSWORD=${SQL_PASSWORD}
- POSTGRES_DB=${SQL_DATABASE}
redis:
image: docker.io/redis:6
container_name: ${REDIS_NAME}
restart: unless-stopped
command: redis-server --save 60 1 --loglevel warning
volumes:
- ./redis_data:/data
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
interval: 60s
timeout: 5s
retries: 3
celeryworker:
procrastinate:
<<: *django
image: ${CELERYWORKER_NAME}
container_name: ${CELERYWORKER_NAME}
image: ${PROCRASTINATE_NAME}
container_name: ${PROCRASTINATE_NAME}
depends_on:
- redis
- db
ports: [ ]
command: /start-celeryworker
command: /start-procrastinate
restart: unless-stopped
healthcheck:
test: [ "NONE" ]
celerybeat:
<<: *django
image: ${CELERYBEAT_NAME}
container_name: ${CELERYBEAT_NAME}
depends_on:
- redis
- db
ports: [ ]
command: /start-celerybeat
restart: unless-stopped
healthcheck:
test: [ "NONE" ]
flower:
<<: *django
image: ${FLOWER_NAME}
container_name: ${FLOWER_NAME}
ports:
- '5556:5555'
command: /start-flower
restart: unless-stopped
healthcheck:
test: curl --fail http://localhost:5555/healthcheck || exit 1
interval: 60s
timeout: 30s
retries: 3
start_period: 360s
networks:
default:

8
docker/dev/celery/beat/start
View File

@@ -1,8 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
rm -f './celerybeat.pid'
exec watchfiles --filter python celery.__main__.main --args '-A WYGIWYH.celery_app beat -l INFO'

9
docker/dev/celery/flower/start
View File

@@ -1,9 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
exec watchfiles --filter python celery.__main__.main \
--args \
"-A WYGIWYH.celery_app -b \"${CELERY_BROKER_URL}\" flower
--basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\""

7
docker/dev/celery/worker/start
View File

@@ -1,7 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
exec watchfiles --filter python celery.__main__.main --args '-A WYGIWYH.celery_app worker -l INFO'

14
docker/dev/django/Dockerfile
View File

@@ -39,17 +39,9 @@ COPY ./docker/dev/django/start /start
RUN sed -i 's/\r$//g' /start
RUN chmod +x /start
COPY ./docker/dev/celery/worker/start /start-celeryworker
RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker
COPY ./docker/dev/celery/beat/start /start-celerybeat
RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat
COPY ./docker/dev/celery/flower/start /start-flower
RUN sed -i 's/\r$//g' /start-flower
RUN chmod +x /start-flower
COPY ./docker/dev/procrastinate/start /start-procrastinate
RUN sed -i 's/\r$//g' /start-procrastinate
RUN chmod +x /start-procrastinate
# copy project
COPY ./app .

7
docker/dev/procrastinate/start Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
set -o errexit
set -o nounset
exec watchfiles --filter python "python manage.py procrastinate worker"

8
docker/prod/celery/beat/start
View File

@@ -1,8 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
rm -f './celerybeat.pid'
exec watchfiles --filter python celery.__main__.main --args '-A WYGIWYH.celery_app beat -l INFO'

9
docker/prod/celery/flower/start
View File

@@ -1,9 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
exec watchfiles --filter python celery.__main__.main \
--args \
"-A WYGIWYH.celery_app -b \"${CELERY_BROKER_URL}\" flower
--basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\""

7
docker/prod/celery/worker/start
View File

@@ -1,7 +0,0 @@
#!/bin/bash
set -o errexit
set -o nounset
exec watchfiles --filter python celery.__main__.main --args '-A WYGIWYH.celery_app worker -l INFO'

14
docker/prod/django/Dockerfile
View File

@@ -51,17 +51,9 @@ COPY --chown=app:app ./docker/prod/django/start /start
RUN sed -i 's/\r$//g' /start
RUN chmod +x /start
COPY --chown=app:app ./docker/prod/celery/worker/start /start-celeryworker
RUN sed -i 's/\r$//g' /start-celeryworker
RUN chmod +x /start-celeryworker
COPY --chown=app:app ./docker/prod/celery/beat/start /start-celerybeat
RUN sed -i 's/\r$//g' /start-celerybeat
RUN chmod +x /start-celerybeat
COPY --chown=app:app ./docker/prod/celery/flower/start /start-flower
RUN sed -i 's/\r$//g' /start-flower
RUN chmod +x /start-flower
COPY --chown=app:app ./docker/prod/procrastinate/start /start-procrastinate
RUN sed -i 's/\r$//g' /start-procrastinate
RUN chmod +x /start-procrastinate
# copy project
COPY ./app .

7
docker/prod/procrastinate/start Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
set -o errexit
set -o nounset
exec python manage.py procrastinate worker

7
requirements.txt
View File

@@ -18,12 +18,7 @@ drf-spectacular~=0.27.2
gunicorn==21.2.0
whitenoise[brotli]==6.6.0
# Celery
redis==5.0.1 # https://github.com/redis/redis-py
hiredis==2.3.2 # https://github.com/redis/hiredis-py
celery==5.3.6 # pyup: < 6.0 # https://github.com/celery/celery
django-celery-beat~=2.7.0 # https://github.com/celery/django-celery-beat
flower==2.0.1 # https://github.com/mher/flower
watchfiles==0.24.0 # https://github.com/samuelcolvin/watchfiles
procrastinate[django]~=2.14
requests~=2.32.3