diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-02 08:41:17 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-02 08:41:17 +0000 |
commit | edfe25845dd3db9f0a07c3780d4160a20e62db3a (patch) | |
tree | 58913d6545ba4e241bc75a228ca635771c73a373 | |
parent | c92c1065abac937e9b44e6ee5defb786ab89050c (diff) | |
parent | 4ffeeadc5caef1ad68c3dbc3f5eec5f74788391b (diff) | |
download | ceilometer-edfe25845dd3db9f0a07c3780d4160a20e62db3a.tar.gz |
Merge "User a more accurate max_delay for reconnects" into stable/havana2013.2.3
-rw-r--r-- | ceilometer/openstack/common/rpc/impl_qpid.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometer/openstack/common/rpc/impl_qpid.py b/ceilometer/openstack/common/rpc/impl_qpid.py index 6a6d1b41..a0caabd3 100644 --- a/ceilometer/openstack/common/rpc/impl_qpid.py +++ b/ceilometer/openstack/common/rpc/impl_qpid.py @@ -517,7 +517,7 @@ class Connection(object): "Sleeping %(delay)s seconds") % msg_dict LOG.error(msg) time.sleep(delay) - delay = min(2 * delay, 60) + delay = min(delay + 1, 5) else: LOG.info(_('Connected to AMQP server on %s'), broker) break |