diff --git a/requirements/prod.txt b/requirements/prod.txt index b8760f6..0634eae 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1,3 +1,4 @@ -r ../vendor/src/funfactory/funfactory/requirements/prod.txt django_browserid requests +newrelic==1.10.2.38 diff --git a/vendor-local/src/django-browserid b/vendor-local/src/django-browserid index 9c66c22..dc86af6 160000 --- a/vendor-local/src/django-browserid +++ b/vendor-local/src/django-browserid @@ -1 +1 @@ -Subproject commit 9c66c229876614d1f0a5426126a5536f7c3c9e0f +Subproject commit dc86af668f7abf7362f13753964cd78562f8980c diff --git a/wsgi/playdoh.wsgi b/wsgi/playdoh.wsgi index b936038..ba5faa3 100644 --- a/wsgi/playdoh.wsgi +++ b/wsgi/playdoh.wsgi @@ -1,6 +1,14 @@ import os import site +newrelic_cfg_file = os.environ.get('NEW_RELIC_CONFIG_FILE') + +if newrelic_cfg_file: + import newrelic.agent + newrelic.agent.initialize(newrelic_cfg_file, + os.environ.get('NEW_RELIC_ENVIRONMENT')) + newrelic_settings = newrelic.agent.global_settings() + os.environ.setdefault('CELERY_LOADER', 'django') # NOTE: you can also set DJANGO_SETTINGS_MODULE in your environment to override # the default value in manage.py @@ -15,4 +23,7 @@ import manage import django.core.handlers.wsgi application = django.core.handlers.wsgi.WSGIHandler() +if newrelic_cfg_file: + application = newrelic.agent.wsgi_application()(application) + # vim: ft=python