diff options
author | Michael Klishin <michael@clojurewerkz.org> | 2016-06-24 23:16:12 +0300 |
---|---|---|
committer | Michael Klishin <michael@clojurewerkz.org> | 2016-06-24 23:16:12 +0300 |
commit | cfb79b4d9a7d0434fbdeed53ada08ea012aba162 (patch) | |
tree | 8446d1f9937fc30897113bfd23dafde46286b2f0 /deps | |
parent | 335e92b4da05f69c40487da00e371b1ebf733de1 (diff) | |
parent | 97cca17ba8735e158f605efd62b03f7b74da2fe1 (diff) | |
download | rabbitmq-server-git-cfb79b4d9a7d0434fbdeed53ada08ea012aba162.tar.gz |
Merge branch 'rabbitmq-web-mqtt-12' into stable
Diffstat (limited to 'deps')
-rw-r--r-- | deps/rabbit_common/src/rabbit_ct_broker_helpers.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/deps/rabbit_common/src/rabbit_ct_broker_helpers.erl b/deps/rabbit_common/src/rabbit_ct_broker_helpers.erl index a7e09d7fd2..4c575257a7 100644 --- a/deps/rabbit_common/src/rabbit_ct_broker_helpers.erl +++ b/deps/rabbit_common/src/rabbit_ct_broker_helpers.erl @@ -83,7 +83,9 @@ tcp_port_amqp_tls, tcp_port_mgmt, tcp_port_erlang_dist, - tcp_port_erlang_dist_proxy + tcp_port_erlang_dist_proxy, + tcp_port_mqtt, + tcp_port_web_mqtt ]). %% ------------------------------------------------------------------- @@ -268,6 +270,14 @@ update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_mgmt = Key | Rest]) -> NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, {rabbitmq_management, [{listener, [{port, ?config(Key, NodeConfig)}]}]}), update_tcp_ports_in_rmq_config(NodeConfig1, Rest); +update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_mqtt = Key | Rest]) -> + NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, + {rabbitmq_mqtt, [{tcp_listeners, [?config(Key, NodeConfig)]}]}), + update_tcp_ports_in_rmq_config(NodeConfig1, Rest); +update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt = Key | Rest]) -> + NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig, + {rabbitmq_web_mqtt, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}), + update_tcp_ports_in_rmq_config(NodeConfig1, Rest); update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_erlang_dist | Rest]) -> %% The Erlang distribution port doesn't appear in the configuration file. update_tcp_ports_in_rmq_config(NodeConfig, Rest); |