diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-07-08 13:09:28 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-07-08 13:09:28 +0000 |
commit | eb605e8c1e2eacb4cae879a62e046cd0573c124d (patch) | |
tree | 1542bac7f64cec0353d62152085536d3cf2ad214 /openstack/common | |
parent | 54fcea25407d6958cfd189f19e0e3c1ed12df91c (diff) | |
parent | c37f6aaab3ac00b7865dee18158114433350237e (diff) | |
download | oslo-master.tar.gz oslo-master.tar.xz oslo-master.zip |
Diffstat (limited to 'openstack/common')
-rw-r--r-- | openstack/common/rpc/impl_kombu.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 36d2fc5..d1d04e0 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -82,6 +82,9 @@ 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'), @@ -449,6 +452,7 @@ 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(): |