Merge lp:~lifeless/python-oops-tools/own-oops into lp:python-oops-tools

[Robert Collins]

If oops-tools breaks, log an OOPS.

If oops-tools breaks, log an OOPS.

[Robert Collins (lifeless)]

self reviewing - this is 99% boilerplate.

review: Approve

=== modified file 'buildout-templates/bin/oopstools.wsgi.in'
--- buildout-templates/bin/oopstools.wsgi.in	2011-10-13 20:18:51 +0000
+++ buildout-templates/bin/oopstools.wsgi.in	2011-12-12 06:17:24 +0000
@@ -11,5 +11,31 @@
 os.environ['DJANGO_SETTINGS_MODULE'] = "oopstools.settings"
 
 import django.core.handlers.wsgi
-
-application = django.core.handlers.wsgi.WSGIHandler()
+from oops_wsgi.django import OOPSWSGIHandler
+
+application = OOPSWSGIHandler()
+
+# Report OOPSes back to us.
+from functools import partial
+from oops import Config
+from oops_wsgi import make_app, install_hooks
+# Transports - AMQP live (dev only service, no need for fallback transport)
+from oops_amqp import Publisher
+from amqplib import client_0_8 as amqp
+
+from django.conf import settings
+
+config = Config()
+config.template['reporter'] = '${configuration:oops-web-amqp-reporter}'
+install_hooks(config)
+# Can add custom filters / hooks if needed - see docs.
+factory = partial(amqp.Connection, host=settings.OOPS_WEB_AMQP_HOST,
+    userid=settings.OOPS_WEB_AMQP_USER,
+    password=settings.OOPS_WEB_AMQP_PASSWORD,
+    virtual_host=settings.OOPS_WEB_AMQP_VHOST, insist=False)
+publisher = Publisher(
+    factory, settings.OOPS_WEB_AMQP_EXCHANGE, settings.OOPS_WEB_AMQP_ROUTING)
+config.publishers.append(publisher)
+
+# finally we can wrap the app with OOPS reporting
+application = make_app(application, config, oops_on_status=['500'])
 
=== modified file 'buildout-templates/src/oopstools/settings.py.in'
--- buildout-templates/src/oopstools/settings.py.in	2011-10-13 20:18:51 +0000
+++ buildout-templates/src/oopstools/settings.py.in	2011-12-12 06:17:24 +0000
@@ -113,3 +113,10 @@
     'oopstools.oops',
     'south'
 )
+
+OOPS_WEB_AMQP_HOST = '${configuration:oops-web-amqp-host}'
+OOPS_WEB_AMQP_USER = '${configuration:oops-web-amqp-user}'
+OOPS_WEB_AMQP_PASSWORD = '${configuration:oops-web-amqp-password}'
+OOPS_WEB_AMQP_VHOST = '${configuration:oops-web-amqp-vhost}'
+OOPS_WEB_AMQP_EXCHANGE = '${configuration:oops-web-amqp-exchange}'
+OOPS_WEB_AMQP_ROUTING = '${configuration:oops-web-amqp-routing}'
 
=== modified file 'buildout.cfg'
--- buildout.cfg	2011-10-16 23:00:57 +0000
+++ buildout.cfg	2011-12-12 06:17:24 +0000
@@ -49,6 +49,14 @@
 report-to-address = [e-mail]
 # Email address reports should be sent from.
 report-from-address = [e-mail]
+# Details for publishing OOPS reports that occur in the django web UI itself.
+oops-web-amqp-host = localhost
+oops-web-amqp-user = guest
+oops-web-amqp-password = guest
+oops-web-amqp-vhost = /
+oops-web-amqp-exchange = oopses
+oops-web-amqp-routing = 
+oops-web-amqp-reporter = oops-tools-dev
 
 [django]
 recipe = djangorecipe
 
=== modified file 'setup.py'
--- setup.py	2011-12-08 05:26:06 +0000
+++ setup.py	2011-12-12 06:17:24 +0000
@@ -56,6 +56,7 @@
         'oops',
         'oops-amqp',
         'oops-datedir-repo',
+        'oops-wsgi',
         'psycopg2',
         'pytz',
         'setuptools',
 
=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2011-12-08 03:44:45 +0000
+++ src/oopstools/NEWS.txt	2011-12-12 06:17:24 +0000
@@ -12,6 +12,9 @@
   the disk copy of the failed OOPS, to ease debugging.
   (Robert Collins, #892914)
 
+* Failures in the Django web UI will now raise an OOPS over AMQP, making
+  oops-tools an oops-tools consumer. (Robert Collins)
+
 * Flush stdout when logging an OOPS receipt in amqp2disk.
   (Robert Collins, #884569)
 
 
=== modified file 'src/oopstools/README.txt'
--- src/oopstools/README.txt	2011-10-16 22:35:01 +0000
+++ src/oopstools/README.txt	2011-12-12 06:17:24 +0000
@@ -61,7 +61,9 @@
 oopsdir = /path/where/rsynced/oopses/are/found
     /another/such/path
 
-Update settings.py setting a custom SECRET_KEY
+Update settings.py setting a custom SECRET_KEY, and appropriate AMQP connection
+details (so that the oops-tools web site itself can report errors, should they
+occur).
 
 To deploy oops tools make sure all the dependecies are installed.
 
@@ -82,6 +84,11 @@
 creation to publish over AMQP. If you are using Python then the oops-amqp
 module will help you do this.
 
+The Django web UI also integrates with AMQP to report errors that occur
+rendering or searching for OOPS reports. The settings to control this are in
+settings.py (or in your configuration file which buildout compiles into a
+settings.py).
+
 Running locally
 ===============
 
 
=== modified file 'versions.cfg'
--- versions.cfg	2011-12-08 18:32:44 +0000
+++ versions.cfg	2011-12-12 06:17:24 +0000
@@ -22,6 +22,7 @@
 oops = 0.0.10
 oops-amqp = 0.0.5
 oops-datedir-repo = 0.0.15
+oops-wsgi = 0.0.9
 # XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is
 # incompatible with Django 1.3, but 2.4.1 works fine.
 psycopg2 = 2.4.1