From 52e857a131eb9bea837ad76bc1f99c40f5620357 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Wed, 19 Jun 2013 16:07:18 -0400
Subject: Ignore any exceptions from rpc.cleanup().

When shutting down a service, we don't care what exceptions might occur
when doing rpc cleanup, so just ignore them.

Change-Id: I8f12cbb129769f78452ed3cb613f485d4712eaf7
---
 openstack/common/service.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'openstack')

diff --git a/openstack/common/service.py b/openstack/common/service.py
index 36cf300..d5c5604 100644
--- a/openstack/common/service.py
+++ b/openstack/common/service.py
@@ -116,7 +116,11 @@ class ServiceLauncher(Launcher):
         finally:
             self.stop()
             if rpc:
-                rpc.cleanup()
+                try:
+                    rpc.cleanup()
+                except Exception:
+                    # We're shutting down, so it doesn't matter at this point.
+                    LOG.exception(_('Exception during rpc cleanup.'))
         return status
 
 
-- 
cgit