Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FAL-2030] Updates kombu package to support multi-tenant redis authentication #397

Merged
merged 2 commits into from
Sep 10, 2021
Merged

[FAL-2030] Updates kombu package to support multi-tenant redis authentication #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb1f2d
chore: constrain kombu to support redis6 auth
pomegranited Jun 23, 2021
3019422
feat: adds CELERY_BROKER_TRANSPORT_OPTIONS
pomegranited Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cms/envs/production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ def get_env_setting(setting):
BROKER_TRANSPORT_OPTIONS = {
'fanout_patterns': True,
'fanout_prefix': True,
**ENV_TOKENS.get('CELERY_BROKER_TRANSPORT_OPTIONS', {})
}

# Message expiry time in seconds
Expand Down
1 change: 1 addition & 0 deletions lms/envs/production.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@ def get_env_setting(setting):
BROKER_TRANSPORT_OPTIONS = {
'fanout_patterns': True,
'fanout_prefix': True,
**ENV_TOKENS.get('CELERY_BROKER_TRANSPORT_OPTIONS', {})
}

# Block Structures
Expand Down
7 changes: 7 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# kombu needs additional functionality to support multi-tenant redis
# This branch backports the following PRs to kombu 4.6.11, because celery 4.4.7 has requirement kombu<4.7,>=4.6.10
# https://github.com/celery/kombu/pull/1351
# https://github.com/celery/kombu/pull/1349
# https://github.com/celery/kombu/pull/1376
git+https://github.com/open-craft/kombu.git@v4.6.11.1#egg=kombu==4.6.11.1

# celery 5.0 has dropped python3.5 support.
celery<5.0

Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jmespath==0.10.0 # via boto3, botocore
joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/../edx-sandbox/shared.txt, nltk
jsondiff==1.2.0 # via edx-enterprise
jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2
kombu==4.6.11 # via celery
git+https://github.com/open-craft/kombu.git@v4.6.11.1#egg=kombu==4.6.11.1 # via -c requirements/edx/../constraints.txt
laboratory==1.0.2 # via -r requirements/edx/base.in
lazy==1.4 # via -r requirements/edx/paver.txt, acid-xblock, lti-consumer-xblock, ora2
libsass==0.10.0 # via -r requirements/edx/paver.txt, ora2
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requi
jsondiff==1.2.0 # via -r requirements/edx/testing.txt, edx-enterprise
jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2
jsonschema==3.2.0 # via sphinxcontrib-openapi
kombu==4.6.11 # via -r requirements/edx/testing.txt, celery
git+https://github.com/open-craft/kombu.git@v4.6.11.1#egg=kombu==4.6.11.1 # via -c requirements/edx/../constraints.txt
laboratory==1.0.2 # via -r requirements/edx/testing.txt
lazy-object-proxy==1.4.3 # via -r requirements/edx/testing.txt, astroid
lazy==1.4 # via -r requirements/edx/testing.txt, acid-xblock, bok-choy, lti-consumer-xblock, ora2
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jmespath==0.10.0 # via -r requirements/edx/base.txt, boto3, botocore
joblib==0.14.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, nltk
jsondiff==1.2.0 # via -r requirements/edx/base.txt, edx-enterprise
jsonfield2==3.0.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-celeryutils, edx-enterprise, edx-proctoring, edx-submissions, ora2
kombu==4.6.11 # via -r requirements/edx/base.txt, celery
git+https://github.com/open-craft/kombu.git@v4.6.11.1#egg=kombu==4.6.11.1 # via -c requirements/edx/../constraints.txt
laboratory==1.0.2 # via -r requirements/edx/base.txt
lazy-object-proxy==1.4.3 # via astroid
lazy==1.4 # via -r requirements/edx/base.txt, acid-xblock, bok-choy, lti-consumer-xblock, ora2
Expand Down