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

[Robert Collins]

Bump to oops-amqp 0.0.0.2, cleanup some cruft.

Bump to oops-amqp 0.0.0.2, cleanup some cruft.

[Robert Collins (lifeless)]

simples

review: Approve

[Stuart Bishop (stub)]

In the name of Senate and Peoples of Rome.

review: Approve

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

3. By Robert Collins on 2011-10-18

Bump to oops-amqp 0.0.0.2, cleanup some cruft.

=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt	2011-10-16 22:35:01 +0000
+++ src/oopstools/NEWS.txt	2011-10-18 04:22:22 +0000
@@ -7,6 +7,8 @@
 
 * Added AMQP support via the bin/amqp2disk script. (Robert Collins)
 
+* Bumped oops-amqp rev to 0.0.2 for bugfixes. (Robert Collins)
+
 0.6
 ===
 
 
=== modified file 'src/oopstools/scripts/amqp2disk.py'
--- src/oopstools/scripts/amqp2disk.py	2011-10-16 22:35:01 +0000
+++ src/oopstools/scripts/amqp2disk.py	2011-10-18 04:22:22 +0000
@@ -18,9 +18,9 @@
 
 __metaclass__ = type
 
+from functools import partial
 import sys
 import optparse
-import StringIO
 from textwrap import dedent
 
 import amqplib.client_0_8 as amqp
@@ -28,21 +28,10 @@
 import oops_amqp
 import oops_datedir_repo
 
-from oopstools.oops.helpers import parsedate, load_prefixes
 from oopstools.oops.models import (
     Oops,
     parsed_oops_to_model_oops,
-    Prefix,
-    Report,
     )
-from oopstools.oops.oopsstore import OopsStore
-from oopstools.oops import dbsummaries
-from oopstools.oops.summaries import (
-    WebAppErrorSummary,
-    CheckwatchesErrorSummary,
-    CodeHostingWithRemoteSectionSummary,
-    GenericErrorSummary,
-)
 
 
 def main(argv=None):
@@ -91,14 +80,23 @@
     needed('password')
     needed('vhost')
     needed('queue')
-    connection = amqp.Connection(host=options.host, userid=options.username,
+    factory = partial(
+        amqp.Connection, host=options.host, userid=options.username,
         password=options.password, virtual_host=options.vhost)
-    channel = connection.channel()
     if options.bind_to:
-        channel.queue_declare(options.queue, durable=True, auto_delete=False)
-        channel.queue_bind(options.queue, options.bind_to)
+        connection = factory()
+        try:
+            channel = connection.channel()
+            try:
+                channel.queue_declare(
+                    options.queue, durable=True, auto_delete=False)
+                channel.queue_bind(options.queue, options.bind_to)
+            finally:
+                channel.close()
+        finally:
+            connection.close()
     config = make_amqp_config(options.output)
-    receiver = oops_amqp.Receiver(config, channel, options.queue)
+    receiver = oops_amqp.Receiver(config, factory, options.queue)
     try:
         receiver.run_forever()
     except KeyboardInterrupt:
 
=== modified file 'versions.cfg'
--- versions.cfg	2011-10-16 22:35:01 +0000
+++ versions.cfg	2011-10-18 04:22:22 +0000
@@ -20,7 +20,7 @@
 lazr.config = 1.1.3
 mechanize = 0.1.11
 oops = 0.0.9
-oops-amqp = 0.0.1
+oops-amqp = 0.0.2
 oops-datedir-repo = 0.0.9
 setuptools = 0.6c11
 z3c.recipe.filetemplate = 2.0.3