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

[Robert Collins]

Show the host and reporter for OOPSes in the detailed view of an OOPS.

Might be useful to know the host an oops occurred on, right?

[lp:~lifeless/python-oops-tools/hostname]

21. By Robert Collins on 2011-11-16

Expose reporter as well.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2011-11-16 08:08:33 +0000
+++ src/oopstools/NEWS.txt	2011-11-16 23:24:24 +0000
@@ -11,6 +11,9 @@
 * Flush stdout when logging an OOPS receipt in amqp2disk.
   (Robert Collins, #884569)
 
+* Hostnames are now shown in the OOPS detail page. This makes it possible to
+  figure out if one host in particular is having trouble. (Robert Collins)
+
 * Long oops ids - which are likely hashes - no longer have the old appserver id
   heuristic applied to them: if they have a missing or empty reporter, they are
   associated with the instance 'unknown'. (Robert Collins, #889982)
@@ -27,6 +30,9 @@
   Timelines without this information will show 'unknown' in the relevant
   column on the OOPS page. (Robert Collins, #890976)
 
+* The OOPS reporter field - or prefix as it was known - is now shown
+  in the OOPS details page. (Robert Collins)
+
 * The req_vars variable in OOPS reports may now be a dict.
   (Robert Collins, #888866)
 
 
=== modified file 'src/oopstools/oops/models.py'
--- src/oopstools/oops/models.py	2011-11-16 08:08:33 +0000
+++ src/oopstools/oops/models.py	2011-11-16 23:24:24 +0000
@@ -523,6 +523,11 @@
         self.parsed_oops = _get_oops(self.pathname)
         return self.parsed_oops
 
+    @readproperty
+    def hostname(self):
+        # Currently from oops reports only.
+        return self.parsed_oops.get('hostname', 'Unknown') or 'Unknown'
+
     def _set_values(self):
         ignore, self.req_vars, self.statements, self.traceback = (
             _get_oops_tuple(self.parsed_oops))
 
=== modified file 'src/oopstools/oops/templates/oops.html'
--- src/oopstools/oops/templates/oops.html	2011-11-16 08:08:33 +0000
+++ src/oopstools/oops/templates/oops.html	2011-11-16 23:24:24 +0000
@@ -37,6 +37,8 @@
   <div id="exception">
     <li>Date: <span>{{ oops.date }}</span></li>
     <li>Page-id: <span>{{ oops.pageid }}</span></li>
+    <li>Reporter: <span>{{ oops.prefix.value }}</span></li>
+    <li>Hostname: <span>{{ oops.hostname }}</span></li>
     {% ifequal oops.oopsinfestation.last_seen_oops.oopsid oops.oopsid %}
       <li>(This is the most recent instance.) </li>
     {% else %}
 
=== modified file 'src/oopstools/oops/test/pagetest.txt'
--- src/oopstools/oops/test/pagetest.txt	2011-11-16 08:08:33 +0000
+++ src/oopstools/oops/test/pagetest.txt	2011-11-16 23:24:24 +0000
@@ -35,6 +35,8 @@
     <...
     ...<title>OOPS-1308x1</title>...
     ...
+    ...Reporter: <span>X</span>...
+    ...Hostname: <span>Unknown</span>...
     ...<div id="request_variables">...
     ...
     ...<li>CHANNEL_CREATION_TIME: 1...</li>...