mozilla · ryanpitts · Jul 8, 2013 · Jul 8, 2013 · Jul 8, 2013
diff --git 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
diff --git 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
+4 −1		.gitignore
+18 −4		.travis.yml
+47 −0		AUTHORS.rst
+86 −11		CHANGELOG.rst
+373 −25		LICENSE
+4 −1		MANIFEST.in
+0 −1		README
+31 −10		README.rst
+11 −2		django_browserid/__init__.py
+59 −30		django_browserid/auth.py
+150 −87		django_browserid/base.py
+18 −3		django_browserid/context_processors.py
+27 −2		django_browserid/forms.py
+187 −0		django_browserid/helpers.py
+16 −0		django_browserid/signals.py
+99 −9		django_browserid/static/browserid/browserid.js
+228 −0		django_browserid/static/browserid/persona-buttons.css
+3 −0		django_browserid/templates/browserid/button.html
+12 −0		django_browserid/templates/browserid/info.html
+0 −0		django_browserid/templatetags/__init__.py
+30 −0		django_browserid/templatetags/browserid.py
+47 −3		django_browserid/tests/__init__.py
+21 −0		django_browserid/tests/models.py
+12 −1		django_browserid/tests/settings.py
+159 −0		django_browserid/tests/test_auth.py
+144 −0		django_browserid/tests/test_base.py
+15 −0		django_browserid/tests/test_forms.py
+155 −0		django_browserid/tests/test_helpers.py
+20 −0		django_browserid/tests/test_util.py
+0 −111		django_browserid/tests/test_verification.py
+115 −50		django_browserid/tests/test_views.py
+8 −1		django_browserid/tests/urls.py
+13 −3		django_browserid/urls.py
+33 −0		django_browserid/util.py
+107 −30		django_browserid/views.py
+14 −2		docs/conf.py
+89 −0		docs/details/advanced.rst
+43 −0		docs/details/api.rst
+0 −76		docs/details/customization.rst
+32 −0		docs/details/js_api.rst
+67 −0		docs/details/settings.rst
+49 −11		docs/details/troubleshooting.rst
+5 −0		docs/dev/authors.rst
+5 −0		docs/dev/changelog.rst
+26 −0		docs/dev/devsetup.rst
+17 −4		docs/index.rst
+216 −77		docs/setup.rst
+0 −19		fabfile.py
+6 −5		requirements.txt
+25 −0		runtests.py
+48 −5		setup.py