Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f37c7934
Commit
f37c7934
authored
Apr 16, 2015
by
Adam Palay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reset queue reference in aws.py, use low priority queue (TNL-1591) (TNL-2003)
parent
afb2dae6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
lms/envs/aws.py
+5
-1
lms/envs/common.py
+1
-1
lms/envs/yaml_config.py
+5
-1
No files found.
lms/envs/aws.py
View file @
f37c7934
...
@@ -204,10 +204,14 @@ BULK_EMAIL_INFINITE_RETRY_CAP = ENV_TOKENS.get('BULK_EMAIL_INFINITE_RETRY_CAP',
...
@@ -204,10 +204,14 @@ BULK_EMAIL_INFINITE_RETRY_CAP = ENV_TOKENS.get('BULK_EMAIL_INFINITE_RETRY_CAP',
BULK_EMAIL_LOG_SENT_EMAILS
=
ENV_TOKENS
.
get
(
'BULK_EMAIL_LOG_SENT_EMAILS'
,
BULK_EMAIL_LOG_SENT_EMAILS
)
BULK_EMAIL_LOG_SENT_EMAILS
=
ENV_TOKENS
.
get
(
'BULK_EMAIL_LOG_SENT_EMAILS'
,
BULK_EMAIL_LOG_SENT_EMAILS
)
BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS
=
ENV_TOKENS
.
get
(
'BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS'
,
BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS
)
BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS
=
ENV_TOKENS
.
get
(
'BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS'
,
BULK_EMAIL_RETRY_DELAY_BETWEEN_SENDS
)
# We want Bulk Email running on the high-priority queue, so we define the
# We want Bulk Email running on the high-priority queue, so we define the
# routing key that points to it.
At the moment, the name is the same.
# routing key that points to it. At the moment, the name is the same.
# We have to reset the value here, since we have changed the value of the queue name.
# We have to reset the value here, since we have changed the value of the queue name.
BULK_EMAIL_ROUTING_KEY
=
HIGH_PRIORITY_QUEUE
BULK_EMAIL_ROUTING_KEY
=
HIGH_PRIORITY_QUEUE
# We can run smaller jobs on the low priority queue. See note above for why
# we have to reset the value here.
BULK_EMAIL_ROUTING_KEY_SMALL_JOBS
=
LOW_PRIORITY_QUEUE
# Theme overrides
# Theme overrides
THEME_NAME
=
ENV_TOKENS
.
get
(
'THEME_NAME'
,
None
)
THEME_NAME
=
ENV_TOKENS
.
get
(
'THEME_NAME'
,
None
)
...
...
lms/envs/common.py
View file @
f37c7934
...
@@ -1524,7 +1524,7 @@ BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
...
@@ -1524,7 +1524,7 @@ BULK_EMAIL_ROUTING_KEY = HIGH_PRIORITY_QUEUE
# We also define a queue for smaller jobs so that large courses don't block
# We also define a queue for smaller jobs so that large courses don't block
# smaller emails (see BULK_EMAIL_JOB_SIZE_THRESHOLD setting)
# smaller emails (see BULK_EMAIL_JOB_SIZE_THRESHOLD setting)
BULK_EMAIL_ROUTING_KEY_SMALL_JOBS
=
DEFAULT
_PRIORITY_QUEUE
BULK_EMAIL_ROUTING_KEY_SMALL_JOBS
=
LOW
_PRIORITY_QUEUE
# For emails with fewer than these number of recipients, send them through
# For emails with fewer than these number of recipients, send them through
# a different queue to avoid large courses blocking emails that are meant to be
# a different queue to avoid large courses blocking emails that are meant to be
...
...
lms/envs/yaml_config.py
View file @
f37c7934
...
@@ -221,10 +221,14 @@ if 'loc_cache' not in CACHES:
...
@@ -221,10 +221,14 @@ if 'loc_cache' not in CACHES:
}
}
# We want Bulk Email running on the high-priority queue, so we define the
# We want Bulk Email running on the high-priority queue, so we define the
# routing key that points to it.
At the moment, the name is the same.
# routing key that points to it. At the moment, the name is the same.
# We have to reset the value here, since we have changed the value of the queue name.
# We have to reset the value here, since we have changed the value of the queue name.
BULK_EMAIL_ROUTING_KEY
=
HIGH_PRIORITY_QUEUE
BULK_EMAIL_ROUTING_KEY
=
HIGH_PRIORITY_QUEUE
# We can run smaller jobs on the low priority queue. See note above for why
# we have to reset the value here.
BULK_EMAIL_ROUTING_KEY_SMALL_JOBS
=
LOW_PRIORITY_QUEUE
LANGUAGE_DICT
=
dict
(
LANGUAGES
)
LANGUAGE_DICT
=
dict
(
LANGUAGES
)
# Additional installed apps
# Additional installed apps
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment