x/gantt
Code Issues Proposed changes

Merge "Don't tell Qpid to reconnect in a busy loop."

Browse Source
This commit is contained in:
Jenkins
2012-02-20 14:16:13 +00:00
committed by Gerrit Code Review
parent d18d9992ce 0ed550aad8
commit 014ec6ab04
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nova/rpc/impl_qpid.py
View File

@@ -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