diff options
| author | Russell Bryant <rbryant@redhat.com> | 2013-06-19 16:07:18 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2013-07-05 09:18:34 -0400 |
| commit | 52e857a131eb9bea837ad76bc1f99c40f5620357 (patch) | |
| tree | f12fd22bfbec6a1b2a0b54bca5c4d3a8daad11b8 /openstack | |
| parent | 6a4800d86ae94123875d510f4f9a7967f09d93cf (diff) | |
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
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/service.py | 6 |
1 files changed, 5 insertions, 1 deletions
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 |