diff options
| author | Jeff Peeler <jpeeler@redhat.com> | 2012-11-12 14:58:28 -0500 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@redhat.com> | 2012-11-12 15:58:05 -0500 |
| commit | 520ea0f32f759314aa7f7acbbb3adf2bcdbd01a7 (patch) | |
| tree | 6c40bcd0cbb4ece7b6abdeb85420ac5ab448f36b | |
| parent | 5e3c7b50398bd79cf4103f062584c12efc685451 (diff) | |
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>
| -rw-r--r-- | openstack/common/service.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |