Tune heartbeat
This commit is contained in:
parent
229473b571
commit
50f760610b
|
@ -281,9 +281,7 @@ def enable_ssl(ssl_key, ssl_cert, ssl_port,
|
||||||
if ssl_ca:
|
if ssl_ca:
|
||||||
data["ssl_ca_file"] = ssl_ca_file
|
data["ssl_ca_file"] = ssl_ca_file
|
||||||
|
|
||||||
with open(RABBITMQ_CONF, 'w') as rmq_conf:
|
return data
|
||||||
rmq_conf.write(render_template(
|
|
||||||
os.path.basename(RABBITMQ_CONF), data))
|
|
||||||
|
|
||||||
|
|
||||||
def execute(cmd, die=False, echo=False):
|
def execute(cmd, die=False, echo=False):
|
||||||
|
|
|
@ -475,12 +475,13 @@ def configure_rabbit_ssl():
|
||||||
"""
|
"""
|
||||||
ssl_mode, external_ca = _get_ssl_mode()
|
ssl_mode, external_ca = _get_ssl_mode()
|
||||||
|
|
||||||
|
data = {}
|
||||||
if ssl_mode == 'off':
|
if ssl_mode == 'off':
|
||||||
if os.path.exists(rabbit.RABBITMQ_CONF):
|
if os.path.exists(rabbit.RABBITMQ_CONF):
|
||||||
os.remove(rabbit.RABBITMQ_CONF)
|
os.remove(rabbit.RABBITMQ_CONF)
|
||||||
close_port(config('ssl_port'))
|
close_port(config('ssl_port'))
|
||||||
reconfigure_client_ssl()
|
reconfigure_client_ssl()
|
||||||
return
|
else:
|
||||||
ssl_key = _convert_from_base64(config('ssl_key'))
|
ssl_key = _convert_from_base64(config('ssl_key'))
|
||||||
ssl_cert = _convert_from_base64(config('ssl_cert'))
|
ssl_cert = _convert_from_base64(config('ssl_cert'))
|
||||||
ssl_ca = _convert_from_base64(config('ssl_ca'))
|
ssl_ca = _convert_from_base64(config('ssl_ca'))
|
||||||
|
@ -496,12 +497,16 @@ def configure_rabbit_ssl():
|
||||||
if not external_ca:
|
if not external_ca:
|
||||||
ssl_cert, ssl_key, ssl_ca = ServiceCA.get_service_cert()
|
ssl_cert, ssl_key, ssl_ca = ServiceCA.get_service_cert()
|
||||||
|
|
||||||
rabbit.enable_ssl(
|
data.update(rabbit.enable_ssl(ssl_key, ssl_cert, ssl_port, ssl_ca,
|
||||||
ssl_key, ssl_cert, ssl_port, ssl_ca,
|
ssl_only=(ssl_mode == "only"),
|
||||||
ssl_only=(ssl_mode == "only"), ssl_client=False)
|
ssl_client=False))
|
||||||
reconfigure_client_ssl(True)
|
reconfigure_client_ssl(True)
|
||||||
open_port(ssl_port)
|
open_port(ssl_port)
|
||||||
|
|
||||||
|
with open(rabbit.RABBITMQ_CONF, 'w') as rmq_conf:
|
||||||
|
rmq_conf.write(rabbit.render_template(
|
||||||
|
os.path.basename(rabbit.RABBITMQ_CONF), data))
|
||||||
|
|
||||||
|
|
||||||
@hooks.hook('config-changed')
|
@hooks.hook('config-changed')
|
||||||
def config_changed():
|
def config_changed():
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
[
|
[
|
||||||
{rabbit, [
|
{rabbit, [
|
||||||
|
{% if ssl_key_file %}
|
||||||
{% if ssl_only %}
|
{% if ssl_only %}
|
||||||
{tcp_listeners, []},
|
{tcp_listeners, []},
|
||||||
{% else %}
|
{% else %}
|
||||||
|
@ -12,10 +13,15 @@
|
||||||
{fail_if_no_peer_cert, true},
|
{fail_if_no_peer_cert, true},
|
||||||
{% else %}
|
{% else %}
|
||||||
{fail_if_no_peer_cert, false},
|
{fail_if_no_peer_cert, false},
|
||||||
{% endif %}{% if ssl_ca_file %}
|
{% endif %}
|
||||||
{cacertfile, "{{ ssl_ca_file }}"}, {% endif %}
|
{% if ssl_ca_file %}
|
||||||
|
{cacertfile, "{{ ssl_ca_file }}"},
|
||||||
|
{% endif %}
|
||||||
{certfile, "{{ ssl_cert_file }}"},
|
{certfile, "{{ ssl_cert_file }}"},
|
||||||
{keyfile, "{{ ssl_key_file }}"}
|
{keyfile, "{{ ssl_key_file }}"}
|
||||||
]}
|
]},
|
||||||
|
{% endif %}
|
||||||
|
{heartbeat, 60}
|
||||||
]}
|
]}
|
||||||
].
|
].
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue