1
=== modified file 'src/oopstools/oops/templates/report.html'
2
--- src/oopstools/oops/templates/report.html	2012-11-29 21:33:52 +0000
3
+++ src/oopstools/oops/templates/report.html	2014-01-31 16:38:48 +0000
4
@@ -17,37 +17,22 @@
5
17
    <table>
17
    <table>
6
18
        <th><tr>
18
        <th><tr>
7
19
            <td>Date/Time</td>
19
            <td>Date/Time</td>
8
20
            <td>Oops</td>
9
21
            <td>Exception Type</td>
10
22
            <td>Duration (ms)</td>
11
20
            <td>HTTP Method</td>
23
            <td>HTTP Method</td>
12
21
            <td>URL</td>
24
            <td>URL</td>
13
22
            <td>Duration (ms)</td>
14
23
            <td>Exception Type</td>
15
24
            <td>Oops</td>
16
25
        </tr></th>
25
        </tr></th>
18
26
        {% for oops in recent.object_list %}
26
        {% for oops, exception_type in recent %}
19
27
        <tr>
27
        <tr>
20
28
            <td>{{oops.date|date:"Y-m-d H:i:s"}}</td>
28
            <td>{{oops.date|date:"Y-m-d H:i:s"}}</td>
21
29
            <td><a href="{% url oopstools.oops.views.index %}?oopsid={{oops.oopsid}}">{{oops.oopsid}}</a></td>
22
30
            <td>{{exception_type}}</td>
23
31
            <td>{{oops.total_time}}</td>
24
29
            <td>{{oops.http_method}}</td>
32
            <td>{{oops.http_method}}</td>
29
30
            <td>{% if oops.url %}<a href="{{oops.url}}">{{oops.url}}</a>{% endif %}</td>
33
            <td>{% if oops.url %}{{oops.url}}{% endif %}</td>
26
31
            <td>{{oops.total_time}}</td>
27
32
            <td>{{oops.exception_type}}</td>
28
33
            <td><a href="{% url oopstools.oops.views.index %}?oopsid={{oops.oopsid}}">{{oops.oopsid}}</a></td>
30
34
        </tr>
34
        </tr>
31
35
        {% endfor %}
35
        {% endfor %}
32
36
    </table>
36
    </table>
33
37
    <div class="pagination">
34
38
        <span class="step-links">
35
39
            {% if recent.has_previous %}
36
40
            <a href="?page={{ recent.previous_page_number }}">newer</a>
37
41
            {% endif %}
38
42
39
43
            <span class="current">
40
44
                Page {{ recent.number }} of {{ recent.paginator.num_pages }}.
41
45
            </span>
42
46
43
47
            {% if recent.has_next %}
44
48
            <a href="?page={{ recent.next_page_number }}">older</a>
45
49
            {% endif %}
46
50
        </span>
47
51
    </div>
48
52
  </body>
37
  </body>
49
53
</html>
38
</html>
50
54
39
51
=== modified file 'src/oopstools/oops/views.py'
52
--- src/oopstools/oops/views.py	2012-12-06 01:07:17 +0000
53
+++ src/oopstools/oops/views.py	2014-01-31 16:38:48 +0000
54
@@ -18,13 +18,12 @@
55
18
from datetime import datetime, timedelta
18
from datetime import datetime, timedelta
56
19
19
57
20
from django.conf import settings
20
from django.conf import settings
58
21
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
59
22
from django.http import Http404, HttpResponseRedirect
21
from django.http import Http404, HttpResponseRedirect
60
23
from django.shortcuts import render_to_response
22
from django.shortcuts import render_to_response
61
24
23
62
25
from oopstools.oops import dbsummaries
24
from oopstools.oops import dbsummaries
63
26
from oopstools.oops.helpers import parsedate
25
from oopstools.oops.helpers import parsedate
65
27
from oopstools.oops.models import Oops, Report
26
from oopstools.oops.models import Infestation, Oops, Report
66
28
from oopstools.oops.prefixloader import PrefixLoader
27
from oopstools.oops.prefixloader import PrefixLoader
67
29
from oopstools.oops.oopsstore import OopsStore, OopsNotFound
28
from oopstools.oops.oopsstore import OopsStore, OopsNotFound
68
30
29
69
@@ -97,30 +96,23 @@
70
97
        "prefixes": prefixes})
96
        "prefixes": prefixes})
71
98
97
72
99
98
97
100
def get_page_from_query_args(paginator, query_args):
99
def get_recent_oops_info(report):
98
101
    """Get the page from ``paginator`` specified in the query params.
100
    prefix_ids = list(report.prefixes.values_list('pk', flat=True))
99
102
101
    recent_oopses = list(Oops.objects.raw("""
100
103
    If the request specified ``page`` in the query params, then that
102
        SELECT whatever.*, pos FROM (
101
104
    page of the paginator will be retrieved.
103
            select *, rank() OVER w AS pos
102
105
104
            FROM oops_oops
103
106
    This function aims to return a page regardless of the page requested,
105
            WHERE "oops_oops"."prefix_id" = ANY(%s)
104
107
    e.g. requesting a page beyond the last page will just return the
106
            WINDOW w AS (PARTITION BY prefix_id ORDER BY date DESC)
105
108
    last page.
107
        ) AS whatever
106
109
108
        WHERE pos <= 50
107
110
    :param paginator: a ``Paginator`` object.
109
        ORDER BY date DESC
108
111
    :param query_args: a ``dict`` of query params.
110
        LIMIT 50;
109
112
    :return: a ``Page`` from the ``Paginator``.
111
    """, [prefix_ids]))
110
113
    """
112
    infestation_pks = set([oops.oopsinfestation_id for oops in recent_oopses])
111
114
    page_num = query_args.get('page', 1)
113
    infestations = Infestation.objects.filter(id__in=infestation_pks).all()
112
115
    try:
114
    exception_types = dict([(i.id, i.exception_type) for i in infestations])
113
116
        page = paginator.page(page_num)
115
    return [(oops, exception_types[oops.oopsinfestation_id]) for oops in recent_oopses]
90
117
    except PageNotAnInteger:
91
118
        # If page is not an integer, deliver first page.
92
119
        page = paginator.page(1)
93
120
    except EmptyPage:
94
121
        # If page is out of range (e.g. 9999), deliver last page of results.
95
122
        page = paginator.page(paginator.num_pages)
96
123
    return page
114
124
116
115
125
117
116
126
def report(request, report_name):
118
def report(request, report_name):
117
@@ -135,17 +127,12 @@
118
135
        dates = []
127
        dates = []
119
136
        for day in range(1, 11):
128
        for day in range(1, 11):
120
137
            dates.append(now - timedelta(day))
129
            dates.append(now - timedelta(day))
127
138
        prefix_ids = list(r.prefixes.values_list('pk', flat=True))
130
        recent = get_recent_oops_info(r)
122
139
        oopses = Oops.objects.filter(
123
140
                prefix__in=prefix_ids).select_related(
124
141
                    'oopsinfestation').order_by('-date')
125
142
        paginator = Paginator(oopses, 50)
126
143
        recent_oopses = get_page_from_query_args(paginator, request.GET)
128
144
        data = {
131
        data = {
129
145
            'report': r,
132
            'report': r,
130
146
            'dates': dates,
133
            'dates': dates,
131
147
            'SUMMARY_URI': settings.SUMMARY_URI,
134
            'SUMMARY_URI': settings.SUMMARY_URI,
133
148
            'recent': recent_oopses,
135
            'recent': recent,
134
149
            }
136
            }
135
150
        return render_to_response("report.html", dictionary=data)
137
        return render_to_response("report.html", dictionary=data)
136
151
138
137
@@ -184,5 +171,3 @@
138
184
                }
171
                }
139
185
            return render_to_response("summary.html", dictionary=data)
172
            return render_to_response("summary.html", dictionary=data)
140
186
173
141
187
142
188
Status:	Needs review
Proposed branch:	lp:~james-w/python-oops-tools/recent-oopses
Merge into:	lp:python-oops-tools
Diff against target:	142 lines (+28/-58) 2 files modified src/oopstools/oops/templates/report.html (+8/-23) src/oopstools/oops/views.py (+20/-35)
To merge this branch:	bzr merge lp:~james-w/python-oops-tools/recent-oopses
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Natalia Bidart (community)		Approve on 2014-01-14
python-oops-tools reviewers	2014-01-14	Pending
Review via email: mp+201639@code.launchpad.net