Merge lp:~james-w/python-oops-tools/recent-oopses into lp:python-oops-tools

[James Westby]

Show the (paginated) oopses for each report.

Hi,

Showing the day-old reports is of limited use, because you don't know
if there are issues with the site at this moment. To try and help with that
show the oopses, sorted with the most recent first, on the report page.

It uses pagination to keep the number of oopses displayed small.

Thanks,

James

[j.c.sackett (jcsackett)]

Looks good. Thanks, James.

review: Approve

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~james-w/python-oops-tools/recent-oopses into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Uninstalling filetemplates.
Updating scripts.
Installing filetemplates.
Updating django.
Updating docs.
Updating tags.
bin/test
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
+N dist/Twisted-12.2.0.tar.bz2
+N dist/lazr.jobrunner-0.11.tar.gz
+N dist/lazr.restful-0.19.7.tar.gz
+N dist/lazr.restful-0.19.8.tar.gz
+N dist/lazr.restful-0.19.9.tar.gz
+N dist/lazr.restfulclient-0.13.1.tar.gz
-D dist/lazr.restful-0.19.2.tar.gz
-D dist/lazr.restful-0.19.3.tar.gz
-D dist/lazr.restful-0.19.4.tar.gz
-D dist/lazr.restful-0.19.5.tar.gz
All changes applied successfully.
Updated to revision 531 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/template/loaders/filesystem.py:58: DeprecationWarning: 'django.template.loaders.filesystem.load_template_source' is deprecated; use 'django.template.loaders.filesystem.Loader' instead.
  DeprecationWarning
/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/template/loaders/app_directories.py:71: DeprecationWarning: 'django.template.loaders.app_directories.load_template_source' is deprecated; use 'django.template.loaders.app_directories.Loader' instead.
  DeprecationWarning
/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/contrib/auth/models.py:393: DeprecationWarning: The user messaging API is deprecated. Please update your code to use the new messages framework.
  category=DeprecationWarning)
........................................E
======================================================================
ERROR: test_recent_oopses (test_report.ReportTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pqm/...

[Curtis Hovey (sinzui)]

Thank you for addressing the upcall issue.

review: Approve (code)

[Launchpad PQM Bot (launchpad-pqm)]

The attempt to merge lp:~james-w/python-oops-tools/recent-oopses into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache
python bootstrap.py \
  --setup-source=download-cache/ez_setup.py \
  --download-base=download-cache/dist --eggs=eggs
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Download error: [Errno 111] Connection refused -- Some packages may not be found!
Generated script '/home/pqm/pqm-workdir/oops-tools/bin/buildout'.
bin/buildout configuration:db-port=5433
Develop: '/home/pqm/pqm-workdir/oops-tools/.'
Uninstalling filetemplates.
Updating scripts.
Installing filetemplates.
Updating django.
Updating docs.
Updating tags.
bin/test
Creating test database for alias 'default'...

W: line 4 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 3 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [precise]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
Tree is up to date at revision 531 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
Traceback (most recent call last):
  File "bin/test", line 58, in <module>
    djangorecipe.test.main('oopstools.settings', 'oopstools')
  File "/home/pqm/pqm-workdir/oops-tools/eggs/djangorecipe-1.3-py2.6.egg/djangorecipe/test.py", line 19, in main
    management.execute_manager(settings, argv=argv)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/core/management/__init__.py", line 438, in execute_manager
    utility.execute()
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/core/management/__init__.py", line 379, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/core/management/base.py", line 191, in run_from_argv
    self.execute(*args, **options.__dict__)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/core/management/base.py", line 220, in execute
    output = self.handle(*args, **options)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/South-0.7.3_r929-py2.6.egg/south/management/commands/test.py", line 8, in handle
    super(Command, self).handle(*args, **kwargs)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/core/management/commands/test.py", line 37, in handle
    failures = test_runner.run_tests(test_labels)
  File "/home/pqm/pqm-workdir/oops-tools/eggs/Django-1.3.3-py2.6.egg/django/test/simple.py", line 359, in run_tests
    old_config = self.setup_databases()
  File "/home/pqm/pqm-workdir/oo...

[lp:~james-w/python-oops-tools/recent-oopses]

49. By James Westby on 2012-12-05

Show the (paginated) oopses for each report.

=== modified file 'src/oopstools/oops/static/oops.css'
--- src/oopstools/oops/static/oops.css	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/static/oops.css	2012-12-04 16:05:33 +0000
@@ -7,7 +7,13 @@
     padding:0px;
 }
 table {
-    border: 1px #000;
+    border: 1px solid #000;
+}
+td {
+    padding: 4px;
+}
+tr:nth-child(2n) {
+    background-color: #eee;
 }
 p,h1,pre {
     margin:0px 10px 10px 10px;

=== modified file 'src/oopstools/oops/templates/report.html'
--- src/oopstools/oops/templates/report.html	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/templates/report.html	2012-12-04 16:05:33 +0000
@@ -13,5 +13,41 @@
       <li><a href="{{SUMMARY_URI}}/{{report.name}}-{{date|date:"Y-m-d"}}.html">{{report.title}} {{date|date:"Y-m-d"}}</a></li>
     {% endfor %}
     <ul>
+    <h2>Recent Oopses</h2>
+    <table>
+        <th><tr>
+            <td>Date/Time</td>
+            <td>HTTP Method</td>
+            <td>URL</td>
+            <td>Duration (ms)</td>
+            <td>Exception Type</td>
+            <td>Oops</td>
+        </tr></th>
+        {% for oops in recent.object_list %}
+        <tr>
+            <td>{{oops.date|date:"Y-m-d H:i:s"}}</td>
+            <td>{{oops.http_method}}</td>
+            <td>{% if oops.url %}<a href="{{oops.url}}">{{oops.url}}</a>{% endif %}</td>
+            <td>{{oops.total_time}}</td>
+            <td>{{oops.exception_type}}</td>
+            <td><a href="{% url oopstools.oops.views.index %}?oopsid={{oops.oopsid}}">{{oops.oopsid}}</a></td>
+        </tr>
+        {% endfor %}
+    </table>
+    <div class="pagination">
+        <span class="step-links">
+            {% if recent.has_previous %}
+            <a href="?page={{ recent.previous_page_number }}">newer</a>
+            {% endif %}
+
+            <span class="current">
+                Page {{ recent.number }} of {{ recent.paginator.num_pages }}.
+            </span>
+
+            {% if recent.has_next %}
+            <a href="?page={{ recent.next_page_number }}">older</a>
+            {% endif %}
+        </span>
+    </div>
   </body>
 </html>

=== modified file 'src/oopstools/oops/test/__init__.py'
--- src/oopstools/oops/test/__init__.py	2011-10-13 20:18:51 +0000
+++ src/oopstools/oops/test/__init__.py	2012-12-04 16:05:33 +0000
@@ -12,5 +12,3 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-

=== added file 'src/oopstools/oops/test/test_report.py'
--- src/oopstools/oops/test/test_report.py	1970-01-01 00:00:00 +0000
+++ src/oopstools/oops/test/test_report.py	2012-12-04 16:05:33 +0000
@@ -0,0 +1,77 @@
+# Copyright 2005-2012 Canonical Ltd.  All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from datetime import datetime
+from operator import attrgetter
+
+from oopstools.oops.models import (
+    AppInstance,
+    Classification,
+    Infestation,
+    Oops,
+    Prefix,
+    Report,
+)
+from oopstools.oops.test.testcase import TestCase
+
+
+class ReportTests(TestCase):
+
+    def test_no_report(self):
+        resp = self.client.get('/reports/some-report/')
+        self.assertEqual(404, resp.status_code)
+
+    def test_inactive_report(self):
+        report_name = 'areport'
+        Report.objects.create(name=report_name, active=False)
+        resp = self.client.get('/reports/%s/' % (report_name,))
+        self.assertEqual(404, resp.status_code)
+
+    def test_no_recent_oopses(self):
+        report_name = 'areport'
+        Report.objects.create(name=report_name, active=True)
+        resp = self.client.get('/reports/%s/' % (report_name,))
+        self.assertEqual(200, resp.status_code)
+        self.assertQuerysetEqual(resp.context['recent'].object_list, [])
+
+    def make_oops(self, prefix):
+        classification = Classification.objects.create(
+                title=self.getUniqueString(prefix="classification"))
+        infestation = Infestation.objects.create(
+                exception_type=self.getUniqueString(prefix="exc_type"),
+                exception_value=self.getUniqueString(prefix="exc_value"))
+        return Oops.objects.create(
+                prefix=prefix, classification=classification,
+                oopsinfestation=infestation, statements_count=100,
+                appinstance=prefix.appinstance, total_time=3,
+                date=datetime.now())
+
+    def make_prefix(self):
+        appinstance = AppInstance.objects.create(
+                title=self.getUniqueString(prefix="appinstance"))
+        return Prefix.objects.create(
+                value=self.getUniqueString(prefix="prefix"),
+                appinstance=appinstance)
+
+    def test_recent_oopses(self):
+        report_name = 'areport'
+        report = Report.objects.create(name=report_name, active=True)
+        prefix = self.make_prefix()
+        report.prefixes.add(prefix)
+        oops = self.make_oops(prefix)
+        resp = self.client.get('/reports/%s/' % (report_name,))
+        self.assertEqual(200, resp.status_code)
+        self.assertQuerysetEqual(
+            resp.context['recent'].object_list, [oops.pk], transform=attrgetter('pk'))

=== added file 'src/oopstools/oops/test/testcase.py'
--- src/oopstools/oops/test/testcase.py	1970-01-01 00:00:00 +0000
+++ src/oopstools/oops/test/testcase.py	2012-12-04 16:05:33 +0000
@@ -0,0 +1,11 @@
+from django.test import TestCase as DjangoTestCase
+from testtools import TestCase as TesttoolsTestCase
+
+
+class TestCase(DjangoTestCase, TesttoolsTestCase):
+
+    def __init__(self, *args, **kwargs):
+        # python2.6 doesn't up-call, so TesttoolsTestCase.__init__
+        # never gets called unless we do this.
+        DjangoTestCase.__init__(self, *args, **kwargs)
+        TesttoolsTestCase.__init__(self, *args, **kwargs)

=== modified file 'src/oopstools/oops/views.py'
--- src/oopstools/oops/views.py	2011-11-03 00:08:18 +0000
+++ src/oopstools/oops/views.py	2012-12-04 16:05:33 +0000
@@ -18,6 +18,7 @@
 from datetime import datetime, timedelta
 
 from django.conf import settings
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import render_to_response
 
@@ -96,6 +97,32 @@
         "prefixes": prefixes})
 
 
+def get_page_from_query_args(paginator, query_args):
+    """Get the page from ``paginator`` specified in the query params.
+
+    If the request specified ``page`` in the query params, then that
+    page of the paginator will be retrieved.
+
+    This function aims to return a page regardless of the page requested,
+    e.g. requesting a page beyond the last page will just return the
+    last page.
+
+    :param paginator: a ``Paginator`` object.
+    :param query_args: a ``dict`` of query params.
+    :return: a ``Page`` from the ``Paginator``.
+    """
+    page_num = query_args.get('page', 1)
+    try:
+        page = paginator.page(page_num)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        page = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        page = paginator.page(paginator.num_pages)
+    return page
+
+
 def report(request, report_name):
     try:
         r = Report.objects.get(name=report_name, active=True)
@@ -108,10 +135,15 @@
         dates = []
         for day in range(1, 11):
             dates.append(now - timedelta(day))
+        oopses = Oops.objects.filter(
+                prefix__report=r).order_by('-date')
+        paginator = Paginator(oopses, 50)
+        recent_oopses = get_page_from_query_args(paginator, request.GET)
         data = {
             'report': r,
             'dates': dates,
             'SUMMARY_URI': settings.SUMMARY_URI,
+            'recent': recent_oopses,
             }
         return render_to_response("report.html", dictionary=data)