diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-11 10:34:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-11 10:34:59 +0000 |
| commit | 23f2ea29bcfbcfd27a1e4eb2712b0f65245cc7ec (patch) | |
| tree | a87c0ca9d5e72f5f6897da68dfd654fd5c68f477 /openstack | |
| parent | 1a2df89c05d33495d7e057dcdf0714d05beb1fc8 (diff) | |
| parent | f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e (diff) | |
| download | oslo-23f2ea29bcfbcfd27a1e4eb2712b0f65245cc7ec.tar.gz oslo-23f2ea29bcfbcfd27a1e4eb2712b0f65245cc7ec.tar.xz oslo-23f2ea29bcfbcfd27a1e4eb2712b0f65245cc7ec.zip | |
Merge "Revert "Add support for heartbeating in the kombu RPC driver""
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 67022ea..3e9e2d9 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -82,9 +82,6 @@ kombu_opts = [ default=0, help='maximum retries with trying to connect to RabbitMQ ' '(the default of 0 implies an infinite retry count)'), - cfg.IntOpt('rabbit_heartbeat', - default=60, - help='Seconds between connection keepalive heartbeats'), cfg.BoolOpt('rabbit_durable_queues', default=False, help='use durable queues in RabbitMQ'), @@ -452,7 +449,6 @@ class Connection(object): 'userid': self.conf.rabbit_userid, 'password': self.conf.rabbit_password, 'virtual_host': self.conf.rabbit_virtual_host, - 'heartbeat': self.conf.rabbit_heartbeat, } for sp_key, value in server_params.iteritems(): |