diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-07-11 05:43:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-11 05:43:29 +0000 |
| commit | f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e (patch) | |
| tree | 5b97f5b32d5546e5350ad6cdaf1140f380503aee /openstack/common | |
| parent | c37f6aaab3ac00b7865dee18158114433350237e (diff) | |
| download | oslo-f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e.tar.gz oslo-f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e.tar.xz oslo-f9f1b4f971f209feebb3bc6d32c397f4daa8ff1e.zip | |
Revert "Add support for heartbeating in the kombu RPC driver"
Fixes bug #1200069
Looks like there's a serious issue with the kombu heartbeat implementation.
This reverts commit c37f6aaab3ac00b7865dee18158114433350237e
Diffstat (limited to 'openstack/common')
| -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 ce8f2d8..8fb3504 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -83,9 +83,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'), @@ -453,7 +450,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(): |