Merge lp:~lifeless/python-oops-tools/amqp-polish into lp:python-oops-tools

[Robert Collins]

Polish to make the amqp oops experience more reliable and pleasant.

Polish to make the amqp oops experience more reliable and pleasant.

[Steve Kowalik (stevenk)]

review: Approve (code)

[lp:~lifeless/python-oops-tools/amqp-polish]

9. By Robert Collins on 2011-11-01

Polish to make the amqp oops experience more reliable and pleasant.

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2011-10-31 02:07:57 +0000
+++ src/oopstools/NEWS.txt	2011-11-01 03:09:25 +0000
@@ -5,6 +5,13 @@
 NEXT
 ====
 
+* Flush stdout when logging an OOPS receipt in amqp2disk.
+  (Robert Collins, #884569)
+
+* Force received OOPS ids to uppercase in amqp2disk to fit in with the UI
+  - otherwise they cannot be accessed.
+  (Robert Collins, #884571)
+
 0.6.1
 =====
 
 
=== modified file 'src/oopstools/scripts/amqp2disk.py'
--- src/oopstools/scripts/amqp2disk.py	2011-10-18 14:18:51 +0000
+++ src/oopstools/scripts/amqp2disk.py	2011-11-01 03:09:25 +0000
@@ -106,6 +106,7 @@
     if options.verbose:
         def print_oops(report):
             print ("Received %s" % report['id'])
+            sys.stdout.flush()
         config.publishers.append(print_oops)
     receiver = oops_amqp.Receiver(config, factory, options.queue)
     try:
@@ -119,6 +120,8 @@
     # the first publisher will either inherit or assign, so this should be
     # impossible.
     assert report['id'] is not None
+    # Fit in with the upper-case assumption in oops-tools.
+    report['id'] = report['id'].upper()
     # Some fallback methods could lead to duplicate paths into the DB: exit
     # early if the OOPS is already loaded.
     try: