Unverified Commit 0aa81e64 by Kevin Falcone Committed by GitHub

Merge pull request #4476 from edx/jibsheet/cleanup-XQUEUE_WORKERS_PER_QUEUE

XQueue stopped using this config years ago
parents 9831dc90 a6dc1a2d
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
Useful for external utilities that are reporting NR metrics. Useful for external utilities that are reporting NR metrics.
- Added XQUEUE_CONSUMER_NEWRELIC_APPNAME which is added to the supervisor start of xqueue_consumer - Added XQUEUE_CONSUMER_NEWRELIC_APPNAME which is added to the supervisor start of xqueue_consumer
if you have New Relic enabled. if you have New Relic enabled.
- Retired XQUEUE_WORKERS_PER_QUEUE
- Role edx_django_service - Role edx_django_service
- Added maintenance page under the flag EDX_DJANGO_SERVICE_ENABLE_S3_MAINTENANCE. - Added maintenance page under the flag EDX_DJANGO_SERVICE_ENABLE_S3_MAINTENANCE.
......
...@@ -54,7 +54,6 @@ XQUEUE_CONSUMER_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT ...@@ -54,7 +54,6 @@ XQUEUE_CONSUMER_NEWRELIC_APPNAME: "{{ COMMON_ENVIRONMENT }}-{{ COMMON_DEPLOYMENT
XQUEUE_SETTINGS_MODULE: "xqueue.aws_settings" XQUEUE_SETTINGS_MODULE: "xqueue.aws_settings"
# Set the number of workers explicitely for xqueue # Set the number of workers explicitely for xqueue
XQUEUE_WORKERS: !!null XQUEUE_WORKERS: !!null
XQUEUE_WORKERS_PER_QUEUE: 12
XQUEUE_SESSION_ENGINE: !!null XQUEUE_SESSION_ENGINE: !!null
XQUEUE_CACHES: !!null XQUEUE_CACHES: !!null
...@@ -83,7 +82,6 @@ xqueue_environment: ...@@ -83,7 +82,6 @@ xqueue_environment:
xqueue_env_config: xqueue_env_config:
XQUEUES: "{{ XQUEUE_QUEUES }}" XQUEUES: "{{ XQUEUE_QUEUES }}"
XQUEUE_WORKERS_PER_QUEUE: "{{ XQUEUE_WORKERS_PER_QUEUE }}"
LOGGING_ENV: "{{ XQUEUE_LOGGING_ENV }}" LOGGING_ENV: "{{ XQUEUE_LOGGING_ENV }}"
SYSLOG_SERVER: "{{ XQUEUE_SYSLOG_SERVER }}" SYSLOG_SERVER: "{{ XQUEUE_SYSLOG_SERVER }}"
LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue" LOG_DIR: "{{ COMMON_DATA_DIR }}/logs/xqueue"
......
...@@ -11,7 +11,7 @@ command={{ executable }} --pythonpath={{ xqueue_code_dir }} --settings=xqueue.{{ ...@@ -11,7 +11,7 @@ command={{ executable }} --pythonpath={{ xqueue_code_dir }} --settings=xqueue.{{
user={{ common_web_user }} user={{ common_web_user }}
directory={{ xqueue_code_dir }} directory={{ xqueue_code_dir }}
environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_STARTUP_TIMEOUT=10,NEW_RELIC_APP_NAME={{ XQUEUE_CONSUMER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}LANG={{ XQUEUE_LANG }},WORKERS_PER_QUEUE={{xqueue_env_config.XQUEUE_WORKERS_PER_QUEUE}} environment={% if COMMON_ENABLE_NEWRELIC_APP %}NEW_RELIC_STARTUP_TIMEOUT=10,NEW_RELIC_APP_NAME={{ XQUEUE_CONSUMER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ NEWRELIC_LICENSE_KEY }},{% endif -%}LANG={{ XQUEUE_LANG }}
stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log stdout_logfile={{ supervisor_log_dir }}/%(program_name)s-stdout.log
stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log stderr_logfile={{ supervisor_log_dir }}/%(program_name)s-stderr.log
......
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
#AS_WORKERS: 1 #AS_WORKERS: 1
#ANALYTICS_WORKERS: 1 #ANALYTICS_WORKERS: 1
#ANALYTICS_API_GUNICORN_WORKERS: 1 #ANALYTICS_API_GUNICORN_WORKERS: 1
#XQUEUE_WORKERS_PER_QUEUE: 2
## Settings for Grade downloads ## Settings for Grade downloads
#EDXAPP_GRADE_STORAGE_TYPE: 's3' #EDXAPP_GRADE_STORAGE_TYPE: 's3'
#EDXAPP_GRADE_BUCKET: 'your-grade-bucket' #EDXAPP_GRADE_BUCKET: 'your-grade-bucket'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment