fix: logic cleanup

Author: connorhaugh

playbooks/roles/edxapp/templates/edx/app/edxapp/worker.sh.j2

@@ -4,8 +4,18 @@
 
 {% set edxapp_venv_bin = edxapp_venv_dir + "/bin" %}
 source {{ edxapp_app_dir }}/edxapp_env
+{% set executable = edxapp_venv_bin + '/celery' %}
+
 {% if COMMON_ENABLE_NEWRELIC_APP %}
-{% set executable = edxapp_venv_bin + '/newrelic-admin run-program ' + edxapp_venv_bin + '/celery' %}
+{% set executable = edxapp_venv_bin + '/newrelic-admin run-program ' + executable %}
+
+export NEW_RELIC_CONFIG_FILE="{{ edxapp_app_dir }}/newrelic.ini"
+if command -v ec2metadata >/dev/null 2>&1; then
+  INSTANCEID=$(ec2metadata --instance-id);
+  HOSTNAME=$(hostname)
+  export NEW_RELIC_PROCESS_HOST_DISPLAY_NAME="$HOSTNAME-$INSTANCEID"
+fi
+{% endif %}
 
 {% if COMMON_ENABLE_DATADOG and COMMON_ENABLE_DATADOG_APP %}
 {% set executable = edxapp_venv_bin + '/ddtrace-run ' + executable %}
@@ -19,16 +29,6 @@ export DD_TRACE_LOG_STREAM_HANDLER=false
 export DD_TRACE_PYMONGO_ENABLED=false
 {% endif -%}
 
-export NEW_RELIC_CONFIG_FILE="{{ edxapp_app_dir }}/newrelic.ini"
-if command -v ec2metadata >/dev/null 2>&1; then
-  INSTANCEID=$(ec2metadata --instance-id);
-  HOSTNAME=$(hostname)
-  export NEW_RELIC_PROCESS_HOST_DISPLAY_NAME="$HOSTNAME-$INSTANCEID"
-fi
-{% else %}
-{% set executable = edxapp_venv_bin + '/celery' %}
-{% endif %}
-
 # We exec so that celery is the child of supervisor and can be managed properly
 
 exec {{ executable }} $@