Merge lp:~pwlars/snappy-proposed-selftest-agent/publish-direct-results-exchange into lp:snappy-proposed-selftest-agent

[Paul Larson]

Eliminate RESULTS_QUEUE

Thanks to cprov for pointing out that we can do this. Now the bogus queue is no longer needed for publishing to the results exchange!

[Celso Providelo (cprov)]

Thank you, Paul.

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~pwlars/snappy-proposed-selftest-agent/publish-direct-results-exchange into lp:snappy-proposed-selftest-agent failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-selftest-agent4imbz5zi/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-selftest-agent4imbz5zi/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agent4imbz5zi/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 3))
Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agent4imbz5zi/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agent4imbz5zi/build/anyjson/setup.py) egg_info for package anyjson

Installing collected packages: kombu, python-logstash, uservice-utils, amqp, anyjson
  Running setup.py install for python-logstash

  Running setup.py install for amqp

  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma

Successfully installed kombu python-logstash uservice-utils amqp anyjson
Cleaning up...
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 1))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 2))
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.0->-r test_requirements.txt (line 1))
  Downloading mccabe-0.3-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools==1.7.1->-r test_requirements.txt (line 2))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-snappy-proposed-selftest-agent4imbz5zi/build/extras/setup.py) egg_info for package extras

Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirements.txt (line 2))
Downloading/unpacking python-mimeparse (from testtools==1.7.1->-r test_requirements.txt (line 2))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/tmp/venv...

=== modified file 'snappy_proposed_selftest_agent/__init__.py'
--- snappy_proposed_selftest_agent/__init__.py	2015-05-28 03:50:20 +0000
+++ snappy_proposed_selftest_agent/__init__.py	2015-05-28 04:10:51 +0000
@@ -21,6 +21,8 @@
 import logging
 import os
 
+from kombu.pools import producers
+
 from uservice_utils.logging import (
     configure_service_logging,
     ExtraLogger,
@@ -41,13 +43,17 @@
         self.connection = connection
         exchange = kombu.Exchange(constants.RESULTS_EXCHANGE,
                                   type='fanout', durable=False)
-        self.queue = kombu.Queue(constants.RESULTS_QUEUE, exchange)
 
     def __call__(self, payload):
         """Take 'payload' and enqueue it on the rabbit exchange."""
-        queue = self.connection.SimpleQueue(self.queue)
-        queue.put(payload)
-        queue.close()
+        with producers[self.connection].acquire(block=True) as producer:
+            publisher = self.connection.ensure(
+                producer,
+                producer.publish,
+                max_retries=3
+            )
+            exchange = self.exchange
+            publisher(payload, exchange=exchange, declare=[exchange])
 
 
 class CoreImageBuilder(object):

=== modified file 'snappy_proposed_selftest_agent/constants.py'
--- snappy_proposed_selftest_agent/constants.py	2015-05-28 03:54:01 +0000
+++ snappy_proposed_selftest_agent/constants.py	2015-05-28 04:10:51 +0000
@@ -31,7 +31,6 @@
 
 # We need to notify the results exchange that the test is in progress
 RESULTS_EXCHANGE = "results.exchange.v1"
-RESULTS_QUEUE = "snappy-proposed.selftest.results"
 
 # The queue we put fatally error'd payloads into:
 DEAD_LETTER_QUEUE = "snappy-proposed.deadletters.v1"