From 520ea0f32f759314aa7f7acbbb3adf2bcdbd01a7 Mon Sep 17 00:00:00 2001
From: Jeff Peeler <jpeeler@redhat.com>
Date: Mon, 12 Nov 2012 14:58:28 -0500
Subject: Change RPC cleanup ordering

RPC cleanup should occur before killing service threadgroup.
Otherwise, the connection pool is going to be (attempted) emptied
after the thread has been killed.

Change-Id: Ie2b2aca495928b7ba39b2175202a072b3592ad72
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
---
 openstack/common/service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openstack')

diff --git a/openstack/common/service.py b/openstack/common/service.py
index dc2d374..d9634dc 100644
--- a/openstack/common/service.py
+++ b/openstack/common/service.py
@@ -132,9 +132,9 @@ class ServiceLauncher(Launcher):
         except SystemExit as exc:
             status = exc.code
         finally:
-            self.stop()
             if rpc:
                 rpc.cleanup()
+            self.stop()
         return status
 
 
-- 
cgit