Merge lp:~kelvin.li/rnr-server/charm-supports into lp:rnr-server

[Kelvin Li]

- use the whitenoise dependency to manage the static assets
- add the conf-manager-juju.txt for rnr charm and keep old bootstrap work without issue
- some juju purpose improvement in MakeFile

use the whitenoise dependency to manage the static assets
add the conf-manager-juju.txt for rnr charm and keep old bootstrap work without issue
some juju purpose improvement in MakeFile

[Michael Nelson (michael.nelson)]

Looks good. I've got a few comments below, but I think it'd be great to get Fabien's review too, as he knows more about rnr (and it's current deployment setup) I think.

Great stuff!

[lp:~kelvin.li/rnr-server/charm-supports]

350. By Kelvin Li on 2015-05-28

turn the SERVE_STATIC_MEDIA off

[Michael Nelson (michael.nelson)]

If you're still around when Fabien starts, ask him to check too, but +1 from me :) (and we'll be able to verify on staging that it works as expected)

06:06 < noodles> kelvin: so, for the current metal deployment, whitenoise's middleware won't even be hit correct? As the apache middle-end (?) will continue to serve the /assets/ directly?
06:15 < kelvin> noodles: yes, I think the /assets/ is serving by apache directly and rnr-project didn't involve the collectstatic by itself in production but by some other scripts which I don't know. If we want to make the whitenoise work without issue on metal, we have to point the STATIC_ROOT to the correct path.
06:22 < noodles> kelvin: I'd leave the metal service as is - if it's working as is with apache serving those files, great. FWIW, I don't think there are any other scripts - it doesn't need to collectstatic, as it's only serving the static for those two apps, which are both explicitly Alias'd in the apache config.

review: Approve

[lp:~kelvin.li/rnr-server/charm-supports]

351. By Kelvin Li on 2015-06-03

revert static storage back to the normal one, to make sure it works in metal environment

352. By Kelvin Li on 2015-06-04

add the revno in header

353. By Kelvin Li on 2015-06-08

update the project name in MakeFile to keep consistent in charm

[Fabián Ezequiel Gallina (fgallina)]

Added a few nitpicks and questions but otherwise this looks great!

[lp:~kelvin.li/rnr-server/charm-supports]

354. By Kelvin Li on 2015-06-10

updates according reviews

[Kelvin Li (kelvin.li)]

some updates according to the review comments.

[lp:~kelvin.li/rnr-server/charm-supports]

355. By Kelvin Li on 2015-06-11

fix the incorrect tarball name

356. By Kelvin Li on 2015-06-12

added the relocated wsgi and related test py files(missed in last commit

357. By Kelvin Li on 2015-06-15

removed virtualenv dependency for juju deployment

358. By Kelvin Li on 2015-06-17

Merged 2 config-manager.txt to remove the mutiple-files maintenance

=== modified file 'Makefile'
--- Makefile	2015-05-06 06:56:11 +0000
+++ Makefile	2015-06-17 04:45:47 +0000
@@ -6,11 +6,10 @@
 HERE := $(shell pwd)
 PYTHONPATH := ${HERE}/src:${HERE}/lib:${PYTHONPATH}
 DJANGO_SETTINGS_MODULE ?= django_project.settings
+CONN_CHECK_CONFIG_PATH ?= /tmp/rnr_conn_check_config.yaml
 
-VIRTUALENV = virtualenv
-VIRTUALENV_DIR ?= ./virtualenv
+VIRTUALENV_DIR ?= ${HERE}/virtualenv
 VIRTUALENV_BIN := ${VIRTUALENV_DIR}/bin
-VIRTUALENV_ARGS ?= --distribute --clear --system-site-packages
 
 LOCAL_SETTINGS_DIR = ../local_config
 LOCAL_SETTINGS_PATH := ${LOCAL_SETTINGS_DIR}/settings.py
@@ -19,13 +18,14 @@
 JUJU_REPO ?= ../.juju-repo
 PROJECT_NAME = rnr-server
 
-# Create archives in labelled directories (ie. r27/$(PROJECT_NAME).tbz2)
+# Create archives in labelled directories (ie. r27/ratings-and-review.tbz2)
 TARBALL_BUILD_LABEL ?= r$(shell bzr revno)
-TARBALL_FILE_NAME = $(PROJECT_NAME).tbz2
+TARBALL_FILE_NAME = ratings-and-reviews.tbz2
 TARBALL_BUILDS_DIR ?= $(JUJU_REPO)/builds
 TARBALL_BUILD_DIR = $(TARBALL_BUILDS_DIR)/$(TARBALL_BUILD_LABEL)
 TARBALL_BUILD_PATH = $(TARBALL_BUILD_DIR)/$(TARBALL_FILE_NAME)
 
+DJANGO_MANAGE := $(PYTHON) $(CURDIR)/django_project/manage.py
 
 export PYTHONPATH
 export DJANGO_SETTINGS_MODULE
@@ -40,10 +40,12 @@
 
 virtualenv:
 	@if test ! -e $(VIRTUALENV_DIR); ! -e $(VIRTUALENV_BIN); then \
-		$(VIRTUALENV) $(VIRTUALENV_DIR) $(VIRTUALENV_ARGS); \
+		echo 'virtualenv not found, creating new one...'; \
+		virtualenv --distribute --clear --system-site-packages $(VIRTUALENV_DIR); \
 	fi;
 
 clean-virtualenv:
+	echo 'cleaning virtualenv...'
 	rm -rf $(VIRTUALENV_DIR)
 
 install-virtualenv-requirements: virtualenv
@@ -58,6 +60,9 @@
 sanitize-sourcedeps:
 	sed -e '1,/# Dependencies/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
 
+sanitize-sourcedeps-for-juju:
+	sed -e '1,/# juju deployment/d;s/^rnr-server/./g;s/bazaar.isd/bazaar.launchpad.net/g' config-manager.txt > $(CM_TMP_CONFIG)
+
 build:
 	$(CM) update $(CM_TMP_CONFIG)
 
@@ -72,19 +77,52 @@
 
 sourcedeps: fetch-sourcedeps install-virtualenv-requirements
 
-bootstrap: local-config sourcedeps 
-
+bootstrap: local-config sourcedeps
+
+bootstrap-juju: local-config sourcedeps-juju collectstatic
+
+clean:
+	@echo "Cleaning ..."
+	rm -rf $(VIRTUALENV_DIR)
+	rm -rf branches/*
+	rm -rf staticfiles
+	rm -f lib/versioninfo.py
+	find -name '*.pyc' -delete
+	find -name '*.~*' -delete
+
+conn-check:
+	@echo "Generating conn-check config from Django settings..."
+	@sudo -u $$(ls -ld $(CURDIR) | awk '{print $$3}') PYTHONPATH=$(PYTHONPATH) \
+		python scripts/settings-to-conncheck.py -m $(DJANGO_SETTINGS_MODULE) -f $(CONN_CHECK_CONFIG_PATH)
+	@echo "Running conn-check..."
+	conn-check $(CONN_CHECK_CONFIG_PATH)
+
+
+###############
+# for juju
+branches/last_build_for_juju: config-manager.txt
+	$(MAKE) sanitize-sourcedeps-for-juju
+	$(MAKE) CONFIGMANAGER=$(CM_TMP_CONFIG) build
+	@rm $(CM_TMP_CONFIG)
+	touch $@
+
+fetch-sourcedeps-juju: branches/last_build_for_juju version
+
+sourcedeps-juju: fetch-sourcedeps-juju
+
+collectstatic:
+	@DJANGO_SETTINGS_MODULE=django_project.settings_build $(DJANGO_MANAGE) collectstatic --noinput
 
 #Tarball
 $(TARBALL_BUILD_DIR):
 	@mkdir -p $(TARBALL_BUILD_DIR)
 
-$(TARBALL_BUILD_PATH): $(TARBALL_BUILD_DIR)
+$(TARBALL_BUILD_PATH): $(TARBALL_BUILD_DIR) tarball_exclude.txt collectstatic
 	@echo "creating deployment tarball at $(TARBALL_BUILD_PATH)"
 	@tar -cj --exclude-from tarball_exclude.txt -f $(TARBALL_BUILD_PATH) ./
 
 build-tarball: $(TARBALL_BUILD_PATH)
 
 
-.PHONY: local-config sanitize-sourcedeps clean-virtualenv virtualenv \
-    install-virtualenv-requirements sourcedeps bootstrap prod-setting
+.PHONY: local-config sanitize-sourcedeps clean-virtualenv \
+    install-virtualenv-requirements sourcedeps bootstrap clean collectstatic

=== modified file 'README'
--- README	2014-11-04 19:24:55 +0000
+++ README	2015-06-17 04:45:47 +0000
@@ -5,17 +5,10 @@
 Getting started
 ===============
 
-0. Enable the dependencies PPA
-::
-
-    sudo apt-get install python-software-properties
-    sudo add-apt-repository ppa:ubuntuone/rnr-dependencies
-    sudo apt-get update
-
 1. Install system dependencies
 ::
-
-    sudo apt-get install rnr-server-{developer-,}dependencies
+    sudo xargs apt-get install -y < dependencies.txt
+    sudo xargs apt-get install -y < dependencies-devel.txt (only used for dev env)
 
 2. Get the code
 ::

=== modified file 'config-manager.txt'
--- config-manager.txt	2015-04-30 06:18:54 +0000
+++ config-manager.txt	2015-06-17 04:45:47 +0000
@@ -9,8 +9,9 @@
 rnr-server                                    bzr+ssh://bazaar.isd/~rnr-developers/rnr-server/trunk
 # Config branch
 rnr-server/branches/config                    bzr+ssh://bazaar.isd/~canonical-ca-hackers/ca-configs/rnr-config;revno=103
+# juju deployment
 # Web themes
-rnr-server/branches/django-web-themes         bzr+ssh://bazaar.isd/~canonical-isd-hackers/web-themes/django;revno=155
+rnr-server/branches/django-web-themes         bzr+ssh://bazaar.isd/~canonical-isd-hackers/web-themes/django;revno=171
 
 # Dependencies
 rnr-server/branches/amqp                      bzr+ssh://bazaar.isd/~ubuntuone-pqm-team/amqp/stable;revno=v1.4.5
@@ -36,3 +37,4 @@
 rnr-server/branches/ssoclient                 bzr+ssh://bazaar.isd/~canonical-isd-hackers/canonical-identity-provider/ssoclient;revno=18
 rnr-server/branches/txstatsd                  bzr+ssh://bazaar.isd/~txstatsd-dev/txstatsd/trunk;revno=104
 rnr-server/branches/conn-check-config         bzr+ssh://bazaar.isd/~ubuntuone-hackers/conn-check/configs;revno=23
+rnr-server/branches/whitenoise                bzr+ssh://bazaar.isd/~ubuntuone-pqm-team/whitenoise/stable

=== modified file 'django_project/settings_base.py'
--- django_project/settings_base.py	2014-10-27 14:43:27 +0000
+++ django_project/settings_base.py	2015-06-17 04:45:47 +0000
@@ -132,6 +132,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    'django.contrib.staticfiles',
     'django_openid_auth',
     'core',
     'reviewsapp',
@@ -377,14 +378,20 @@
     'token_secret': '',
     'token_key': '',
 }
-STATICFILES_DIRS = []
+STATICFILES_DIRS = [
+    ('reviewsapp', os.path.join(SRC_DIR, 'reviewsapp/media')),
+    ('light', os.path.join(BASE_DIR, 'branches/django-web-themes/light')),
+    ('light', os.path.join(BASE_DIR, 'branches/django-web-themes/assets/light')),
+]
 STATICFILES_FINDERS = [
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 ]
 STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
-STATIC_ROOT = ''
-STATIC_URL = '/static/'
+#TODO:will open following storage once switch to juju env
+#STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage'
+STATIC_ROOT = 'staticfiles'
+STATIC_URL = '/assets/'
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',

=== added file 'django_project/settings_build.py'
--- django_project/settings_build.py	1970-01-01 00:00:00 +0000
+++ django_project/settings_build.py	2015-06-17 04:45:47 +0000
@@ -0,0 +1,7 @@
+import os
+os.environ.setdefault('RNR_LOGS_DIR', '/tmp')
+from django_project.settings_base import *  # noqa
+SECRET_KEY = 'build key'
+
+LOGGING['handlers']['file']['filename'] = os.path.join(
+    LOGS_DIR, 'rnr_hudson.log')

=== modified file 'django_project/settings_devel.py'
--- django_project/settings_devel.py	2014-10-27 16:03:35 +0000
+++ django_project/settings_devel.py	2015-06-17 04:45:47 +0000
@@ -18,3 +18,4 @@
 TEMPLATE_DIRS = [
     os.path.join(BASE_DIR, 'django_project', 'templates'),
 ]
+STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'

=== modified file 'django_project/wsgi.py'
--- django_project/wsgi.py	2014-08-07 16:02:58 +0000
+++ django_project/wsgi.py	2015-06-17 04:45:47 +0000
@@ -32,7 +32,7 @@
 default_id = ''.join(x for x in platform.node() if x.isalpha())
 appserver_id = getattr(settings, 'APPSERVER_ID', default_id)
 
-from reviewsapp.wsgi import make_app
+from core.wsgi import make_app
 app = make_app()
 
 

=== added symlink 'lib/conn_check_configs'
=== target is u'../branches/conn-check-config/conn_check_configs'
=== added symlink 'lib/whitenoise'
=== target is u'../branches/whitenoise/whitenoise'
=== added file 'src/core/tests/test_wsgi.py'
--- src/core/tests/test_wsgi.py	1970-01-01 00:00:00 +0000
+++ src/core/tests/test_wsgi.py	2015-06-17 04:45:47 +0000
@@ -0,0 +1,114 @@
+import bson
+import os
+
+from tempfile import mkdtemp
+from shutil import rmtree
+
+from django.test.utils import override_settings
+from django.utils.http import urlencode
+from mock import Mock
+
+from core.wsgi import make_app, BzrRevnoMiddleware
+from core.tests.factory import TestCaseWithFactory
+
+
+@override_settings(ENABLE_ARTIFICIAL_OOPS=True)
+class WSGIDispatchTestCase(TestCaseWithFactory):
+
+    def setUp(self):
+        """Create a temporary directory for oopses."""
+        self.oops_dir = mkdtemp()
+        self.addCleanup(rmtree, self.oops_dir)
+
+        self.environ = {
+            'PATH_INFO': '/',
+            'QUERY_STRING': '',
+            'REMOTE_ADDR': '127.0.0.1',
+            'REQUEST_METHOD': 'GET',
+            'SCRIPT_NAME': '',
+            'SERVER_NAME': 'testserver',
+            'SERVER_PORT': '80',
+            'SERVER_PROTOCOL': 'HTTP/1.1',
+            'wsgi.version': (1, 0),
+            'wsgi.url_scheme': 'http',
+            'wsgi.multiprocess': True,
+            'wsgi.multithread': False,
+            'wsgi.run_once': False,
+            'wsgi.input': '',
+            'oops.report': {},
+        }
+        super(WSGIDispatchTestCase, self).setUp()
+
+    def request_500_exception(self, data={}):
+        """Helper for creating a 500 exception."""
+        self.environ['PATH_INFO'] = '/reviews/die/'
+        if data != {}:
+            self.environ['QUERY_STRING'] = urlencode(data, doseq=True)
+
+        response = self.request_wsgi_response(self.environ)
+        return response
+
+    def request_wsgi_response(self, environ):
+        start_response = Mock()
+        oops_config = {
+            'publishers': [{
+                'inherit_id': True,
+                'error_dir': self.oops_dir,
+                'type': 'datedir',
+                'new_only': False,
+            }]}
+        with override_settings(OOPSES=oops_config):
+            app = make_app()
+            response = app(environ, start_response).next()
+        return response
+
+    def read_oops_from_disk(self):
+        # Helper to read in the oops written to disk.
+        # There is only one date directory in the oops directory.
+        dated_dirs = os.listdir(self.oops_dir)
+        self.assertEqual(1, len(dated_dirs))
+
+        # There is only one oops.
+        todays_oops_path = dated_dirs[0]
+        oops_list = os.listdir(self.oops_dir + '/' + todays_oops_path)
+        self.assertEqual(1, len(oops_list))
+
+        oops_path = self.oops_dir + '/' + todays_oops_path + '/' + oops_list[0]
+        with open(oops_path, "r") as oops_file:
+            oops_file_contents = oops_file.read()
+        return bson.decode_all(oops_file_contents)
+
+    def test_oopsid_in_500_response(self):
+        # The rendered response for a 500 exception includes the oops id.
+        response = self.request_500_exception()
+
+        self.assertTrue(self.environ['oops.report']['id'] in response)
+
+    def test_traceback_in_500_oops_on_disk(self):
+        # A request resulting in a 500 writes the oops to disk.
+        self.request_500_exception()
+
+        oops = self.read_oops_from_disk()[0]
+        self.assertEqual(oops.get('type'), 'ZeroDivisionError')
+        self.assertIn('tb_text', oops)
+        self.assertTrue(oops['tb_text'].startswith('  File '))
+
+    def test_delay_triggers_an_oops(self):
+        self.environ['PATH_INFO'] = '/reviews/delay/0.11/'
+        with override_settings(SOFT_TIMEOUT_MILLISECONDS=1):
+            self.request_wsgi_response(self.environ)
+
+        oops_content = self.read_oops_from_disk()[0]
+        self.assertEqual('SoftRequestTimeout', oops_content['type'])
+        expected = u'Start_response over timeout 1.'
+        self.assertEqual(expected, oops_content['value'])
+
+    def test_bzr_header(self):
+        BzrRevnoMiddleware.REVNO_HEADER = ('HEADER', 'VALUE')
+        app = make_app()
+        _start_response = Mock('/',)
+        app(self.environ, _start_response).next()
+        start_response_args = _start_response.mock_calls[0][1]
+        headers = start_response_args[1]
+        self.assertIn(('HEADER', 'VALUE'), headers)
+

=== added file 'src/core/wsgi.py'
--- src/core/wsgi.py	1970-01-01 00:00:00 +0000
+++ src/core/wsgi.py	2015-06-17 04:45:47 +0000
@@ -0,0 +1,75 @@
+import oops_dictconfig
+import oops_wsgi
+import uuid
+
+from django.conf import settings
+from django.core.handlers import wsgi
+
+from versioninfo import version_info
+
+from whitenoise.django import DjangoWhiteNoise
+
+
+class EagerOOPSWSGIHandler(wsgi.WSGIHandler):
+    """Pre-generates an oops id on exception."""
+    def handle_uncaught_exception(self, request, resolver, exc_info):
+        # This will pass the exception information back to oops.  It
+        # should not be necessary once
+        # https://code.djangoproject.com/ticket/16674 has been merged.
+        if 'oops.context' in request.environ:
+            request.environ['oops.context']['exc_info'] = exc_info
+        # Generate OOPS id early so that we can render the error page right
+        # away and not depend on passing thread locals around.
+        if 'oops.report' in request.environ:
+            unique_id = uuid.uuid4().hex
+            request.environ['oops.report']['id'] = "OOPS-%s" % unique_id
+
+        return super(EagerOOPSWSGIHandler, self).handle_uncaught_exception(
+            request, resolver, exc_info)
+
+    def __call__(self, environ, start_response):
+        def start_response_with_exc_info(status, headers, exc_info=None):
+            """Custom start_response callback for wsgi."""
+            # This will pass the exception information back to oops_wgi.  It
+            # should not be necessary once
+            # https://code.djangoproject.com/ticket/16674 has been merged.
+            if exc_info is None:
+                exc_info = environ['oops.context'].get('exc_info', None)
+            return start_response(status, headers, exc_info)
+        return super(EagerOOPSWSGIHandler, self).__call__(
+            environ, start_response_with_exc_info)
+
+
+class BzrRevnoMiddleware(object):
+    REVNO_HEADER = ('X-Bzr-Revision-Number', version_info['revno'])
+
+    def __init__(self, app):
+        self.app = app
+
+    def __call__(self, environ, start_response):
+
+        def custom_start_response(status, headers, exc_info=None):
+            headers.append(self.REVNO_HEADER)
+            return start_response(status, headers, exc_info)
+
+        return self.app(environ, custom_start_response)
+
+
+def make_app():
+    """Encapsulate our RNR handler in an OOPS app for error reporting."""
+
+    non_oops_app = EagerOOPSWSGIHandler()
+
+    non_oops_app = BzrRevnoMiddleware(non_oops_app)
+
+    non_oops_app = DjangoWhiteNoise(non_oops_app)
+
+    config = oops_dictconfig.config_from_dict(settings.OOPSES)
+    oops_wsgi.install_hooks(config)
+    soft_timeout = settings.SOFT_TIMEOUT_MILLISECONDS
+    oops_app = oops_wsgi.make_app(non_oops_app, config, oops_on_status=['500'],
+                                  soft_start_timeout=soft_timeout)
+    return oops_app
+
+
+application = make_app()

=== modified file 'src/reviewsapp/templates/reviewsapp/overview.html'
--- src/reviewsapp/templates/reviewsapp/overview.html	2013-04-10 13:15:09 +0000
+++ src/reviewsapp/templates/reviewsapp/overview.html	2015-06-17 04:45:47 +0000
@@ -1,5 +1,6 @@
 {% extends "light/index.1col.html" %}
 {% load i18n %}
+{% load static from staticfiles %}
 
 {% block title %}
   {% trans "Ubuntu Software Center Reviews" %}
@@ -10,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-<img style="float:right" src="/assets/reviewsapp/images/softwarecenter_icon_150.png" alt="Ubuntu Software Center" />
+<img style="float:right" src="{% static 'reviewsapp/images/softwarecenter_icon_150.png' %}" alt="Ubuntu Software Center" />
 
 <p class="introduction">{% blocktrans %}You can now review your favourite software in Ubuntu directly from Ubuntu Software Center.{% endblocktrans %}</p>
 

=== removed file 'src/reviewsapp/tests/test_wsgi.py'
--- src/reviewsapp/tests/test_wsgi.py	2014-09-22 16:58:33 +0000
+++ src/reviewsapp/tests/test_wsgi.py	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-import bson
-import os
-
-from tempfile import mkdtemp
-from shutil import rmtree
-
-from django.test.utils import override_settings
-from django.utils.http import urlencode
-from mock import Mock
-
-from reviewsapp.wsgi import make_app
-from reviewsapp.tests.factory import TestCaseWithFactory
-
-
-@override_settings(ENABLE_ARTIFICIAL_OOPS=True)
-class WSGIDispatchTestCase(TestCaseWithFactory):
-
-    def setUp(self):
-        super(WSGIDispatchTestCase, self).setUp()
-        """Create a temporary directory for oopses."""
-        self.oops_dir = mkdtemp()
-        self.addCleanup(rmtree, self.oops_dir)
-
-        self.environ = {
-            'PATH_INFO': '/',
-            'QUERY_STRING': '',
-            'REMOTE_ADDR': '127.0.0.1',
-            'REQUEST_METHOD': 'GET',
-            'SCRIPT_NAME': '',
-            'SERVER_NAME': 'testserver',
-            'SERVER_PORT': '80',
-            'SERVER_PROTOCOL': 'HTTP/1.1',
-            'wsgi.version': (1, 0),
-            'wsgi.url_scheme': 'http',
-            'wsgi.multiprocess': True,
-            'wsgi.multithread': False,
-            'wsgi.run_once': False,
-            'wsgi.input': '',
-            'oops.report': {},
-        }
-
-    def request_500_exception(self, data={}):
-        """Helper for creating a 500 exception."""
-        self.environ['PATH_INFO'] = '/reviews/die/'
-        if data != {}:
-            self.environ['QUERY_STRING'] = urlencode(data, doseq=True)
-
-        response = self.request_wsgi_response(self.environ)
-        return response
-
-    def request_wsgi_response(self, environ):
-        start_response = Mock()
-        oops_config = {
-            'publishers': [{
-                'inherit_id': True,
-                'error_dir': self.oops_dir,
-                'type': 'datedir',
-                'new_only': False,
-            }]}
-        with override_settings(OOPSES=oops_config):
-            app = make_app()
-            response = app(environ, start_response).next()
-        return response
-
-    def read_oops_from_disk(self):
-        # Helper to read in the oops written to disk.
-        # There is only one date directory in the oops directory.
-        dated_dirs = os.listdir(self.oops_dir)
-        self.assertEqual(1, len(dated_dirs))
-
-        # There is only one oops.
-        todays_oops_path = dated_dirs[0]
-        oops_list = os.listdir(self.oops_dir + '/' + todays_oops_path)
-        self.assertEqual(1, len(oops_list))
-
-        oops_path = self.oops_dir + '/' + todays_oops_path + '/' + oops_list[0]
-        with open(oops_path, "r") as oops_file:
-            oops_file_contents = oops_file.read()
-        return bson.decode_all(oops_file_contents)
-
-    def test_oopsid_in_500_response(self):
-        # The rendered response for a 500 exception includes the oops id.
-        response = self.request_500_exception()
-
-        self.assertTrue(self.environ['oops.report']['id'] in response)
-
-    def test_traceback_in_500_oops_on_disk(self):
-        # A request resulting in a 500 writes the oops to disk.
-        self.request_500_exception()
-
-        oops = self.read_oops_from_disk()[0]
-        self.assertEqual(oops.get('type'), 'ZeroDivisionError')
-        self.assertIn('tb_text', oops)
-        self.assertTrue(oops['tb_text'].startswith('  File '))
-
-    def test_delay_triggers_an_oops(self):
-        self.environ['PATH_INFO'] = '/reviews/delay/0.11/'
-        with override_settings(SOFT_TIMEOUT_MILLISECONDS=1):
-            self.request_wsgi_response(self.environ)
-
-        oops_content = self.read_oops_from_disk()[0]
-        self.assertEqual('SoftRequestTimeout', oops_content['type'])
-        expected = u'Start_response over timeout 1.'
-        self.assertEqual(expected, oops_content['value'])

=== removed file 'src/reviewsapp/wsgi.py'
--- src/reviewsapp/wsgi.py	2014-01-03 11:11:18 +0000
+++ src/reviewsapp/wsgi.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-import oops_dictconfig
-import oops_wsgi
-import uuid
-
-from django.conf import settings
-from django.core.handlers import wsgi
-
-
-class EagerOOPSWSGIHandler(wsgi.WSGIHandler):
-    """Pre-generates an oops id on exception."""
-    def handle_uncaught_exception(self, request, resolver, exc_info):
-        # This will pass the exception information back to oops.  It
-        # should not be necessary once
-        # https://code.djangoproject.com/ticket/16674 has been merged.
-        if 'oops.context' in request.environ:
-            request.environ['oops.context']['exc_info'] = exc_info
-        # Generate OOPS id early so that we can render the error page right
-        # away and not depend on passing thread locals around.
-        if 'oops.report' in request.environ:
-            unique_id = uuid.uuid4().hex
-            request.environ['oops.report']['id'] = "OOPS-%s" % unique_id
-
-        return super(EagerOOPSWSGIHandler, self).handle_uncaught_exception(
-            request, resolver, exc_info)
-
-    def __call__(self, environ, start_response):
-        def start_response_with_exc_info(status, headers, exc_info=None):
-            """Custom start_response callback for wsgi."""
-            # This will pass the exception information back to oops_wgi.  It
-            # should not be necessary once
-            # https://code.djangoproject.com/ticket/16674 has been merged.
-            if exc_info is None:
-                exc_info = environ['oops.context'].get('exc_info', None)
-            return start_response(status, headers, exc_info)
-        return super(EagerOOPSWSGIHandler, self).__call__(
-            environ, start_response_with_exc_info)
-
-
-def make_app():
-    """Encapsulate our RNR handler in an OOPS app for error reporting."""
-
-    non_oops_app = EagerOOPSWSGIHandler()
-
-    config = oops_dictconfig.config_from_dict(settings.OOPSES)
-    oops_wsgi.install_hooks(config)
-    soft_timeout = settings.SOFT_TIMEOUT_MILLISECONDS
-    oops_app = oops_wsgi.make_app(non_oops_app, config, oops_on_status=['500'],
-                                  soft_start_timeout=soft_timeout)
-    return oops_app
-
-
-application = make_app()

=== removed directory 'virtualenv'