diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-20 14:16:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-20 14:16:13 +0000 |
| commit | c1939e576be7ce96735c4734913ae9274752fed9 (patch) | |
| tree | 18c9bea42bdac8d7ccbce3097537240dd6667e3f | |
| parent | 9a174189b42fc59de9467f60eb6ca0ba4d80f6c8 (diff) | |
| parent | b12c20fc48d82a6b888dee761dd46959d21d556a (diff) | |
| download | nova-c1939e576be7ce96735c4734913ae9274752fed9.tar.gz nova-c1939e576be7ce96735c4734913ae9274752fed9.tar.xz nova-c1939e576be7ce96735c4734913ae9274752fed9.zip | |
Merge "Don't tell Qpid to reconnect in a busy loop."
| -rw-r--r-- | nova/rpc/impl_qpid.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nova/rpc/impl_qpid.py b/nova/rpc/impl_qpid.py index 98f8b06d6..2e71d470d 100644 --- a/nova/rpc/impl_qpid.py +++ b/nova/rpc/impl_qpid.py @@ -299,13 +299,18 @@ class Connection(object): self.connection.password = params['password'] self.connection.sasl_mechanisms = FLAGS.qpid_sasl_mechanisms self.connection.reconnect = FLAGS.qpid_reconnect - self.connection.reconnect_timeout = FLAGS.qpid_reconnect_timeout - self.connection.reconnect_limit = FLAGS.qpid_reconnect_limit - _qpid_reconnect_interval_max = FLAGS.qpid_reconnect_interval_max - self.connection.reconnect_interval_max = _qpid_reconnect_interval_max - _qpid_reconnect_interval_min = FLAGS.qpid_reconnect_interval_min - self.connection.reconnect_interval_min = _qpid_reconnect_interval_min - self.connection.reconnect_interval = FLAGS.qpid_reconnect_interval + if FLAGS.qpid_reconnect_timeout: + self.connection.reconnect_timeout = FLAGS.qpid_reconnect_timeout + if FLAGS.qpid_reconnect_limit: + self.connection.reconnect_limit = FLAGS.qpid_reconnect_limit + if FLAGS.qpid_reconnect_interval_max: + self.connection.reconnect_interval_max = ( + FLAGS.qpid_reconnect_interval_max) + if FLAGS.qpid_reconnect_interval_min: + self.connection.reconnect_interval_min = ( + FLAGS.qpid_reconnect_interval_min) + if FLAGS.qpid_reconnect_interval: + self.connection.reconnect_interval = FLAGS.qpid_reconnect_interval self.connection.hearbeat = FLAGS.qpid_heartbeat self.connection.protocol = FLAGS.qpid_protocol self.connection.tcp_nodelay = FLAGS.qpid_tcp_nodelay |