Merge "Module to manage pip packages"

[yardstick.git] / yardstick / network_services / nfvi / collectd.py

diff --git a/yardstick/network_services/nfvi/collectd.py b/yardstick/network_services/nfvi/collectd.py
index ea80e4f..e0027bb 100644 (file)
--- a/yardstick/network_services/nfvi/collectd.py
+++ b/yardstick/network_services/nfvi/collectd.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-""" AMQP Consumer senario definition """
+""" AMQP Consumer scenario definition """
 
 from __future__ import absolute_import
 from __future__ import print_function
@@ -28,12 +28,14 @@ class AmqpConsumer(object):
     ROUTING_KEY = 'collectd'
 
     def __init__(self, amqp_url, queue):
+        super(AmqpConsumer, self).__init__()
         self._connection = None
         self._channel = None
         self._closing = False
         self._consumer_tag = None
         self._url = amqp_url
         self._queue = queue
+        self._queue.cancel_join_thread()
 
     def connect(self):
         """ connect to amqp url """