diff options
| author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-06-21 15:44:18 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-07-02 09:48:25 +0200 |
| commit | dea334a3f55ee7876fdb1b4717e7be8f21499b81 (patch) | |
| tree | 5320ced3aee67cb55e6dd1eaf6f2a80ea3296c82 /openstack | |
| parent | 262d6a5f53e1ecfdcf7f605e011b9985fcd62822 (diff) | |
| download | oslo-dea334a3f55ee7876fdb1b4717e7be8f21499b81.tar.gz oslo-dea334a3f55ee7876fdb1b4717e7be8f21499b81.tar.xz oslo-dea334a3f55ee7876fdb1b4717e7be8f21499b81.zip | |
Replace sys.exit by a RPCException
This change replace sys.exit by a RPCException like the zmq
implementation does, to allow library users to handle the case of the
rpc failure in their applications.
Change-Id: Iafda7bfa20840fa5488dece1d5ad49e2b14b73b5
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 8fb3504..36d2fc5 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -18,7 +18,6 @@ import functools import itertools import socket import ssl -import sys import time import uuid @@ -561,13 +560,11 @@ class Connection(object): log_info.update(params) if self.max_retries and attempt == self.max_retries: - LOG.error(_('Unable to connect to AMQP server on ' - '%(hostname)s:%(port)d after %(max_retries)d ' - 'tries: %(err_str)s') % log_info) - # NOTE(comstud): Copied from original code. There's - # really no better recourse because if this was a queue we - # need to consume on, we have no way to consume anymore. - sys.exit(1) + msg = _('Unable to connect to AMQP server on ' + '%(hostname)s:%(port)d after %(max_retries)d ' + 'tries: %(err_str)s') % log_info + LOG.error(msg) + raise rpc_common.RPCException(msg) if attempt == 1: sleep_time = self.interval_start or 1 |