Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ttl removed from yaml config and default value addedto aws

Browse Source
This commit is contained in:
syed-awais-ali
2017-02-09 16:47:48 +05:00
parent 95c6edd187
commit 65d4b76d9b
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cms/envs/aws.py
View File

@@ -65,9 +65,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
BROKER_HEARTBEAT = 10.0
BROKER_HEARTBEAT_CHECKRATE = 2
# Message expiry time in seconds, Default is 5 seconds
CELERY_EVENT_QUEUE_TTL = 10
# Each worker should only fetch one message at a time
CELERYD_PREFETCH_MULTIPLIER = 1
@@ -366,6 +363,9 @@ BROKER_URL = "{0}://{1}:{2}@{3}/{4}".format(CELERY_BROKER_TRANSPORT,
CELERY_BROKER_VHOST)
BROKER_USE_SSL = ENV_TOKENS.get('CELERY_BROKER_USE_SSL', False)
# Message expiry time in seconds
CELERY_EVENT_QUEUE_TTL = ENV_TOKENS.get('CELERY_EVENT_QUEUE_TTL', None)
# Allow CELERY_QUEUES to be overwritten by ENV_TOKENS,
ENV_CELERY_QUEUES = ENV_TOKENS.get('CELERY_QUEUES', None)
if ENV_CELERY_QUEUES:

3
cms/envs/yaml_config.py
View File

@@ -110,9 +110,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
BROKER_HEARTBEAT = 10.0
BROKER_HEARTBEAT_CHECKRATE = 2
# Message expiry time in seconds, Default is 5 seconds
CELERY_EVENT_QUEUE_TTL = 10
# Each worker should only fetch one message at a time
CELERYD_PREFETCH_MULTIPLIER = 1

6
lms/envs/aws.py
View File

@@ -74,9 +74,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
BROKER_HEARTBEAT = 10.0
BROKER_HEARTBEAT_CHECKRATE = 2
# Message expiry time in seconds, Default is 5 seconds
CELERY_EVENT_QUEUE_TTL = 10
# Each worker should only fetch one message at a time
CELERYD_PREFETCH_MULTIPLIER = 1
@@ -265,6 +262,9 @@ BULK_EMAIL_ROUTING_KEY_SMALL_JOBS = ENV_TOKENS.get('BULK_EMAIL_ROUTING_KEY_SMALL
# Queue to use for updating persistent grades
RECALCULATE_GRADES_ROUTING_KEY = ENV_TOKENS.get('RECALCULATE_GRADES_ROUTING_KEY', LOW_PRIORITY_QUEUE)
# Message expiry time in seconds
CELERY_EVENT_QUEUE_TTL = ENV_TOKENS.get('CELERY_EVENT_QUEUE_TTL', None)
# Allow CELERY_QUEUES to be overwritten by ENV_TOKENS,
ENV_CELERY_QUEUES = ENV_TOKENS.get('CELERY_QUEUES', None)
if ENV_CELERY_QUEUES:

3
lms/envs/yaml_config.py
View File

@@ -133,9 +133,6 @@ CELERY_RESULT_BACKEND = 'djcelery.backends.cache:CacheBackend'
BROKER_HEARTBEAT = 10.0
BROKER_HEARTBEAT_CHECKRATE = 2
# Message expiry time in seconds, Default is 5 seconds
CELERY_EVENT_QUEUE_TTL = 10
# Each worker should only fetch one message at a time
CELERYD_PREFETCH_MULTIPLIER = 1