diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-09 14:17:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-09 14:17:42 +0000 |
| commit | 233f6e7411eacbe4ac2082ca034309b0e09435e9 (patch) | |
| tree | 0529cb3a13f5fb46e3667b53063dcaa8f132b115 /openstack | |
| parent | ca3ed6562ae7c9bac0fd9e0d564a90f9bf964ace (diff) | |
| parent | 52e857a131eb9bea837ad76bc1f99c40f5620357 (diff) | |
Merge "Ignore any exceptions from rpc.cleanup()."
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 |