Skip to content

Commit

Permalink
fix: Поменял константы у redis и rabbitmq
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonVagabond committed Mar 5, 2024
1 parent 66b637c commit 3fe600a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
11 changes: 6 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ EMAIL_HOST_USER=
EMAIL_HOST_PASSWORD=
EMAIL_USE_TLS=

REDIS_HOST=
REDIS_PORT=
REDIS_URL=

RABBIT_HOST=
RABBIT_PORT=
RABBIT_URL=

CELERY_TASK_TRACK_STARTED=
ACCEPT_CONTENT=
Expand All @@ -30,4 +28,7 @@ TIMEZONE=

YOOKASSA_SHOP_ID=
YOOKASSA_SECRET_KEY=
YOOKASSA_RETURN_URL=
YOOKASSA_RETURN_URL=

STATIC_FILES=/path/to/static/
MEDIA_FILES=/path/to/media/
12 changes: 5 additions & 7 deletions config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,27 +253,25 @@
# endregion -------------------------------------------------------------------------

# region ------------------------------- REDIS --------------------------------------
REDIS_HOST = env.str(var='REDIS_HOST', default='localhost')
REDIS_PORT = env.int(var='REDIS_PORT', default=6379)
REDIS_URL = env.str(var='REDIS_URL', default='redis://localhost:6379/0')
# Кэш с помощью => Redis.
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
'LOCATION': f'redis://{REDIS_HOST}:{REDIS_PORT}',
'LOCATION': REDIS_URL,
}
}
# endregion -------------------------------------------------------------------------

# region ----------------------------- RABBITMQ -------------------------------------
RABBIT_HOST = env.str(var='RABBIT_HOST', default='localhost')
RABBIT_PORT = env.int(var='RABBIT_PORT', default=5672)
RABBIT_URL = env.str(var='RABBITMQ_URL', default='amqp://guest:guest@localhost:5672')
# endregion -------------------------------------------------------------------------

# region ------------------------------- CELERY -------------------------------------
# Использование брокера сообщений для Celery на базе RabbitMQ.
CELERY_BROKER_URL = f'amqp://guest:guest@{RABBIT_HOST}:{RABBIT_PORT}'
CELERY_BROKER_URL = RABBIT_URL
# Использование БД для Celery на базе Redis.
CELERY_RESULT_BACKEND = f'redis://{REDIS_HOST}:{REDIS_PORT}'
CELERY_RESULT_BACKEND = REDIS_URL
CELERY_TASK_TRACK_STARTED = env.bool(var='CELERY_TASK_TRACK_STARTED', default=False)
CELERY_TASK_TIME_LIMIT = 30 * 60
accept_content = [env.str(var='ACCEPT_CONTENT', default='application/json')]
Expand Down

0 comments on commit 3fe600a

Please sign in to comment.