From: Jakub Libosvar <libosvar@redhat.com>
Date: Wed, 29 Oct 2014 09:02:10 +0000 (+0100)
Subject: Use stop() method on MessageHandlingServer
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=42f4c8d0e693a7ef8b058111f5e1bf1ecc618620;p=openstack-build%2Fneutron-build.git

Use stop() method on MessageHandlingServer

MessageHandlingServer has no kill() method. In case neutron server using
rpc workers and is stopped, wrong method is called.

Change-Id: Id4a11f3dca070e684fb9e079139ac09792bc7aad
Closes-Bug: 1387053
---

diff --git a/neutron/service.py b/neutron/service.py
index eb48687cb..1761bacc4 100644
--- a/neutron/service.py
+++ b/neutron/service.py
@@ -129,7 +129,7 @@ class RpcWorker(object):
     def stop(self):
         for server in self._servers:
             if isinstance(server, rpc_server.MessageHandlingServer):
-                server.kill()
+                server.stop()
             self._servers = []