root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update to ranch 2.0

This commit is contained in:
dcorbacho 2021-03-08 22:59:22 +01:00
parent 3755b5b03f
commit 61f7b2a723
55 changed files with 237 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

6
deps/rabbit/src/rabbit_connection_sup.erl vendored
View File

@ -19,7 +19,7 @@
-behaviour(supervisor2).
-behaviour(ranch_protocol).
-export([start_link/4, reader/1]).
-export([start_link/3, reader/1]).
-export([init/1]).
@ -27,10 +27,10 @@
%%----------------------------------------------------------------------------
-spec start_link(any(), rabbit_net:socket(), module(), any()) ->
-spec start_link(any(), module(), any()) ->
{'ok', pid(), pid()}.
start_link(Ref, _Sock, _Transport, _Opts) ->
start_link(Ref, _Transport, _Opts) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
%% We need to get channels in the hierarchy here so they get shut
%% down after the reader, so the reader gets a chance to terminate

2
deps/rabbit_common/mk/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_amqp1_0/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_auth_backend_cache/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_auth_backend_http/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_auth_backend_ldap/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_auth_backend_oauth2/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_consistent_hash_exchange/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_event_exchange/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_federation/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_federation_management/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_jms_topic_exchange/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_management/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_management_agent/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_mqtt/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

4
deps/rabbitmq_mqtt/src/rabbit_mqtt_connection_sup.erl vendored
View File

@ -12,13 +12,13 @@
-include_lib("rabbit_common/include/rabbit.hrl").
-export([start_link/4, start_keepalive_link/0]).
-export([start_link/3, start_keepalive_link/0]).
-export([init/1]).
%%----------------------------------------------------------------------------
start_link(Ref, _Sock, _Transport, []) ->
start_link(Ref, _Transport, []) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
{ok, KeepaliveSup} = supervisor2:start_child(
SupPid,

2
deps/rabbitmq_peer_discovery_aws/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_peer_discovery_common/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_peer_discovery_consul/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_peer_discovery_etcd/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_peer_discovery_k8s/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_prometheus/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_random_exchange/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_recent_history_exchange/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_sharding/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_shovel/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_shovel_management/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_stomp/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

4
deps/rabbitmq_stomp/src/rabbit_stomp_client_sup.erl vendored
View File

@ -20,9 +20,9 @@
-include_lib("rabbit_common/include/rabbit.hrl").
-export([start_link/4, init/1]).
-export([start_link/3, init/1]).
start_link(Ref, _Sock, _Transport, Configuration) ->
start_link(Ref, _Transport, Configuration) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
{ok, HelperPid} =
supervisor2:start_child(SupPid,

2
deps/rabbitmq_stream/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

4
deps/rabbitmq_stream/src/rabbit_stream_connection_sup.erl vendored
View File

@ -21,11 +21,11 @@
-include_lib("rabbit_common/include/rabbit.hrl").
-export([start_link/4,
-export([start_link/3,
start_keepalive_link/0]).
-export([init/1]).
start_link(Ref, _Sock, Transport, Opts) ->
start_link(Ref, Transport, Opts) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
{ok, KeepaliveSup} =
supervisor2:start_child(SupPid,

2
deps/rabbitmq_stream_management/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_stream_prometheus/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_top/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_tracing/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_trust_store/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_web_dispatch/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_sup.erl vendored
View File

@ -39,7 +39,7 @@ ensure_listener(Listener) ->
[rabbit_cowboy_middleware, cowboy_router, cowboy_handler],
stream_handlers => StreamHandlers},
ProtoOptsMap),
Child = ranch:child_spec(rabbit_networking:ranch_ref(Listener), 100,
Child = ranch:child_spec(rabbit_networking:ranch_ref(Listener),
Transport, TransportOpts,
cowboy_clear, CowboyOptsMap),
case supervisor:start_child(?SUP, Child) of

2
deps/rabbitmq_web_mqtt/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

3
deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_app.erl vendored
View File

@ -86,7 +86,8 @@ mqtt_init() ->
]}]),
CowboyOpts = CowboyOpts0#{env => #{dispatch => Routes},
middlewares => [cowboy_router, rabbit_web_mqtt_middleware, cowboy_handler],
proxy_header => get_env(proxy_protocol, false)},
proxy_header => get_env(proxy_protocol, false),
stream_handlers => [rabbit_web_mqtt_stream_handler, cowboy_stream_h]},
case get_env(tcp_config, []) of
[] -> ok;
TCPConf0 -> start_tcp_listener(TCPConf0, CowboyOpts)

9
deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_connection_sup.erl vendored
View File

@ -12,13 +12,13 @@
-include_lib("rabbit_common/include/rabbit.hrl").
-export([start_link/4, start_keepalive_link/0]).
-export([start_link/3, start_keepalive_link/0]).
-export([init/1]).
%%----------------------------------------------------------------------------
start_link(Ref, Sock, Transport, CowboyOpts0) ->
start_link(Ref, Transport, CowboyOpts0) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
{ok, KeepaliveSup} = supervisor2:start_child(
SupPid,
@ -31,8 +31,7 @@ start_link(Ref, Sock, Transport, CowboyOpts0) ->
%% then have the middleware rabbit_web_mqtt_middleware place it
%% in the initial handler state.
Env = maps:get(env, CowboyOpts0),
CowboyOpts = CowboyOpts0#{env => Env#{keepalive_sup => KeepaliveSup,
socket => Sock}},
CowboyOpts = CowboyOpts0#{env => Env#{keepalive_sup => KeepaliveSup}},
Protocol = case Transport of
ranch_tcp -> cowboy_clear;
ranch_ssl -> cowboy_tls
@ -40,7 +39,7 @@ start_link(Ref, Sock, Transport, CowboyOpts0) ->
{ok, ReaderPid} = supervisor2:start_child(
SupPid,
{Protocol,
{Protocol, start_link, [Ref, Sock, Transport, CowboyOpts]},
{Protocol, start_link, [Ref, Transport, CowboyOpts]},
intrinsic, ?WORKER_WAIT, worker, [Protocol]}),
{ok, SupPid, ReaderPid}.

103
deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl vendored
View File

@ -7,6 +7,7 @@
-module(rabbit_web_mqtt_handler).
-behaviour(cowboy_websocket).
-behaviour(cowboy_sub_protocol).
-export([
init/2,
@ -17,6 +18,11 @@
]).
-export([close_connection/2]).
%% cowboy_sub_protocol
-export([upgrade/4,
upgrade/5,
takeover/7]).
-include_lib("amqp_client/include/amqp_client.hrl").
-record(state, {
@ -33,55 +39,70 @@
connection
}).
%% cowboy_sub_protcol
upgrade(Req, Env, Handler, HandlerState) ->
upgrade(Req, Env, Handler, HandlerState, #{}).
upgrade(Req, Env, Handler, HandlerState, Opts) ->
cowboy_websocket:upgrade(Req, Env, Handler, HandlerState, Opts).
takeover(Parent, Ref, Socket, Transport, Opts, Buffer, {Handler, HandlerState}) ->
Sock = case HandlerState#state.socket of
undefined ->
Socket;
ProxyInfo ->
{rabbit_proxy_socket, Socket, ProxyInfo}
end,
cowboy_websocket:takeover(Parent, Ref, Socket, Transport, Opts, Buffer,
{Handler, HandlerState#state{socket = Sock}}).
%% cowboy_websocket
init(Req, Opts) ->
{PeerAddr, _PeerPort} = maps:get(peer, Req),
{_, KeepaliveSup} = lists:keyfind(keepalive_sup, 1, Opts),
{_, Sock0} = lists:keyfind(socket, 1, Opts),
Sock = case maps:get(proxy_header, Req, undefined) of
undefined ->
Sock0;
ProxyInfo ->
{rabbit_proxy_socket, Sock0, ProxyInfo}
end,
SockInfo = maps:get(proxy_header, Req, undefined),
WsOpts0 = proplists:get_value(ws_opts, Opts, #{}),
WsOpts = maps:merge(#{compress => true}, WsOpts0),
Req2 = case cowboy_req:header(<<"sec-websocket-protocol">>, Req) of
undefined -> Req;
SecWsProtocol ->
cowboy_req:set_resp_header(<<"sec-websocket-protocol">>, SecWsProtocol, Req)
end,
{?MODULE, Req2, #state{
keepalive = {none, none},
keepalive_sup = KeepaliveSup,
parse_state = rabbit_mqtt_frame:initial_state(),
state = running,
conserve_resources = false,
socket = SockInfo,
peername = PeerAddr
}, WsOpts}.
websocket_init(State0 = #state{socket = Sock, peername = PeerAddr}) ->
case rabbit_net:connection_string(Sock, inbound) of
{ok, ConnStr} ->
Req2 = case cowboy_req:header(<<"sec-websocket-protocol">>, Req) of
undefined -> Req;
SecWsProtocol ->
cowboy_req:set_resp_header(<<"sec-websocket-protocol">>, SecWsProtocol, Req)
end,
WsOpts0 = proplists:get_value(ws_opts, Opts, #{}),
WsOpts = maps:merge(#{compress => true}, WsOpts0),
{cowboy_websocket, Req2, #state{
conn_name = ConnStr,
keepalive = {none, none},
keepalive_sup = KeepaliveSup,
parse_state = rabbit_mqtt_frame:initial_state(),
state = running,
conserve_resources = false,
socket = Sock,
peername = PeerAddr
}, WsOpts};
State = State0#state{
conn_name = ConnStr,
socket = Sock
},
rabbit_log_connection:info("accepting Web MQTT connection ~p (~s)~n", [self(), ConnStr]),
AdapterInfo = amqp_connection:socket_adapter_info(Sock, {'Web MQTT', "N/A"}),
RealSocket = rabbit_net:unwrap_socket(Sock),
ProcessorState = rabbit_mqtt_processor:initial_state(Sock,
rabbit_mqtt_reader:ssl_login_name(RealSocket),
AdapterInfo,
fun send_reply/2,
PeerAddr),
process_flag(trap_exit, true),
{ok,
rabbit_event:init_stats_timer(
State#state{proc_state = ProcessorState},
#state.stats_timer),
hibernate};
_ ->
{stop, Req}
{stop, State0}
end.
websocket_init(State = #state{conn_name = ConnStr, socket = Sock, peername = PeerAddr}) ->
rabbit_log_connection:info("accepting Web MQTT connection ~p (~s)~n", [self(), ConnStr]),
AdapterInfo = amqp_connection:socket_adapter_info(Sock, {'Web MQTT', "N/A"}),
RealSocket = rabbit_net:unwrap_socket(Sock),
ProcessorState = rabbit_mqtt_processor:initial_state(Sock,
rabbit_mqtt_reader:ssl_login_name(RealSocket),
AdapterInfo,
fun send_reply/2,
PeerAddr),
process_flag(trap_exit, true),
{ok,
rabbit_event:init_stats_timer(
State#state{proc_state = ProcessorState},
#state.stats_timer),
hibernate}.
-spec close_connection(pid(), string()) -> 'ok'.
close_connection(Pid, Reason) ->
rabbit_log_connection:info("Web MQTT: will terminate connection process ~p, reason: ~s",

4
deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_middleware.erl vendored
View File

@ -12,11 +12,9 @@
execute(Req, Env) ->
#{keepalive_sup := KeepaliveSup} = Env,
Sock = maps:get(socket, Env),
case maps:get(handler_opts, Env, undefined) of
undefined -> {ok, Req, Env};
Opts when is_list(Opts) ->
{ok, Req, Env#{handler_opts => [{keepalive_sup, KeepaliveSup},
{socket, Sock}
{ok, Req, Env#{handler_opts => [{keepalive_sup, KeepaliveSup}
|Opts]}}
end.

41
deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_stream_handler.erl vendored Normal file
View File

@ -0,0 +1,41 @@
%% This Source Code Form is subject to the terms of the Mozilla Public
%% License, v. 2.0. If a copy of the MPL was not distributed with this
%% file, You can obtain one at https://mozilla.org/MPL/2.0/.
%%
%% Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved.
%%
-module(rabbit_web_mqtt_stream_handler).
-behavior(cowboy_stream).
-export([init/3]).
-export([data/4]).
-export([info/3]).
-export([terminate/3]).
-export([early_error/5]).
-record(state, {next}).
init(StreamID, Req, Opts) ->
{Commands, Next} = cowboy_stream:init(StreamID, Req, Opts),
{Commands, #state{next = Next}}.
data(StreamID, IsFin, Data, State = #state{next = Next0}) ->
{Commands, Next} = cowboy_stream:data(StreamID, IsFin, Data, Next0),
{Commands, State#state{next = Next}}.
info(StreamID, {switch_protocol, Headers, _, InitialState}, State) ->
do_info(StreamID, {switch_protocol, Headers, rabbit_web_mqtt_handler, InitialState}, State);
info(StreamID, Info, State) ->
do_info(StreamID, Info, State).
do_info(StreamID, Info, State = #state{next = Next0}) ->
{Commands, Next} = cowboy_stream:info(StreamID, Info, Next0),
{Commands, State#state{next = Next}}.
terminate(StreamID, Reason, State = #state{next = Next}) ->
cowboy_stream:terminate(StreamID, Reason, Next).
early_error(StreamID, Reason, PartialReq, Resp, Opts) ->
cowboy_stream:early_error(StreamID, Reason, PartialReq, Resp, Opts).

2
deps/rabbitmq_web_mqtt_examples/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
deps/rabbitmq_web_stomp/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

10
deps/rabbitmq_web_stomp/src/rabbit_web_stomp_connection_sup.erl vendored
View File

@ -12,12 +12,12 @@
-include_lib("rabbit_common/include/rabbit.hrl").
-export([start_link/4, start_keepalive_link/0]).
-export([start_link/3, start_keepalive_link/0]).
-export([init/1]).
%%----------------------------------------------------------------------------
start_link(Ref, Sock, Transport, CowboyOpts0) ->
start_link(Ref, Transport, CowboyOpts0) ->
{ok, SupPid} = supervisor2:start_link(?MODULE, []),
{ok, KeepaliveSup} = supervisor2:start_child(
SupPid,
@ -29,8 +29,8 @@ start_link(Ref, Sock, Transport, CowboyOpts0) ->
%% then have the middleware rabbit_web_mqtt_middleware place it
%% in the initial handler state.
Env = maps:get(env, CowboyOpts0),
CowboyOpts = CowboyOpts0#{env => Env#{keepalive_sup => KeepaliveSup,
socket => Sock}},
CowboyOpts = CowboyOpts0#{env => Env#{keepalive_sup => KeepaliveSup},
stream_handlers => [rabbit_web_stomp_stream_handler, cowboy_stream_h]},
Protocol = case Transport of
ranch_tcp -> cowboy_clear;
ranch_ssl -> cowboy_tls
@ -38,7 +38,7 @@ start_link(Ref, Sock, Transport, CowboyOpts0) ->
{ok, ReaderPid} = supervisor2:start_child(
SupPid,
{Protocol,
{Protocol, start_link, [Ref, Sock, Transport, CowboyOpts]},
{Protocol, start_link, [Ref, Transport, CowboyOpts]},
intrinsic, ?WORKER_WAIT, worker, [Protocol]}),
{ok, SupPid, ReaderPid}.

37
deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl vendored
View File

@ -7,6 +7,7 @@
-module(rabbit_web_stomp_handler).
-behaviour(cowboy_websocket).
-behaviour(cowboy_sub_protocol).
-include_lib("rabbitmq_stomp/include/rabbit_stomp.hrl").
-include_lib("rabbitmq_stomp/include/rabbit_stomp_frame.hrl").
@ -22,6 +23,11 @@
]).
-export([close_connection/2]).
%% cowboy_sub_protocol
-export([upgrade/4,
upgrade/5,
takeover/7]).
-record(state, {
frame_type,
heartbeat_mode,
@ -38,17 +44,30 @@
connection
}).
%% cowboy_sub_protcol
upgrade(Req, Env, Handler, HandlerState) ->
upgrade(Req, Env, Handler, HandlerState, #{}).
upgrade(Req, Env, Handler, HandlerState, Opts) ->
cowboy_websocket:upgrade(Req, Env, Handler, HandlerState, Opts).
takeover(Parent, Ref, Socket, Transport, Opts, Buffer, {Handler, HandlerState}) ->
Sock = case HandlerState#state.socket of
undefined ->
Socket;
ProxyInfo ->
{rabbit_proxy_socket, Socket, ProxyInfo}
end,
Env0 = maps:get(env, Opts, #{}),
Env = Env0#{socket => Sock},
cowboy_websocket:takeover(Parent, Ref, Socket, Transport, maps:put(env, Env, Opts), Buffer,
{Handler, HandlerState#state{socket = Sock}}).
%% Websocket.
init(Req0, Opts) ->
{PeerAddr, _PeerPort} = maps:get(peer, Req0),
{_, KeepaliveSup} = lists:keyfind(keepalive_sup, 1, Opts),
{_, Sock0} = lists:keyfind(socket, 1, Opts),
Sock = case maps:get(proxy_header, Req0, undefined) of
undefined ->
Sock0;
ProxyInfo ->
{rabbit_proxy_socket, Sock0, ProxyInfo}
end,
SockInfo = maps:get(proxy_header, Req0, undefined),
Req = case cowboy_req:parse_header(<<"sec-websocket-protocol">>, Req0) of
undefined -> Req0;
Protocols ->
@ -61,14 +80,14 @@ init(Req0, Opts) ->
end,
WsOpts0 = proplists:get_value(ws_opts, Opts, #{}),
WsOpts = maps:merge(#{compress => true}, WsOpts0),
{cowboy_websocket, Req, #state{
{?MODULE, Req, #state{
frame_type = proplists:get_value(type, Opts, text),
heartbeat_sup = KeepaliveSup,
heartbeat = {none, none},
heartbeat_mode = heartbeat,
state = running,
conserve_resources = false,
socket = Sock,
socket = SockInfo,
peername = PeerAddr,
auth_hd = cowboy_req:header(<<"authorization">>, Req)
}, WsOpts}.

3
deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl vendored
View File

@ -32,7 +32,8 @@
init() ->
WsFrame = get_env(ws_frame, text),
CowboyOpts0 = maps:from_list(get_env(cowboy_opts, [])),
CowboyOpts = CowboyOpts0#{proxy_header => get_env(proxy_protocol, false)},
CowboyOpts = CowboyOpts0#{proxy_header => get_env(proxy_protocol, false),
stream_handlers => [rabbit_web_stomp_stream_handler, cowboy_stream_h]},
CowboyWsOpts = maps:from_list(get_env(cowboy_ws_opts, [])),
VhostRoutes = [

4
deps/rabbitmq_web_stomp/src/rabbit_web_stomp_middleware.erl vendored
View File

@ -12,11 +12,9 @@
execute(Req, Env) ->
#{keepalive_sup := KeepaliveSup} = Env,
Sock = maps:get(socket, Env),
case maps:get(handler_opts, Env, undefined) of
undefined -> {ok, Req, Env};
Opts when is_list(Opts) ->
{ok, Req, Env#{handler_opts => [{keepalive_sup, KeepaliveSup},
{socket, Sock}
{ok, Req, Env#{handler_opts => [{keepalive_sup, KeepaliveSup}
|Opts]}}
end.

41
deps/rabbitmq_web_stomp/src/rabbit_web_stomp_stream_handler.erl vendored Normal file
View File

@ -0,0 +1,41 @@
%% This Source Code Form is subject to the terms of the Mozilla Public
%% License, v. 2.0. If a copy of the MPL was not distributed with this
%% file, You can obtain one at https://mozilla.org/MPL/2.0/.
%%
%% Copyright (c) 2007-2021 VMware, Inc. or its affiliates. All rights reserved.
%%
-module(rabbit_web_stomp_stream_handler).
-behavior(cowboy_stream).
-export([init/3]).
-export([data/4]).
-export([info/3]).
-export([terminate/3]).
-export([early_error/5]).
-record(state, {next}).
init(StreamID, Req, Opts) ->
{Commands, Next} = cowboy_stream:init(StreamID, Req, Opts),
{Commands, #state{next = Next}}.
data(StreamID, IsFin, Data, State = #state{next = Next0}) ->
{Commands, Next} = cowboy_stream:data(StreamID, IsFin, Data, Next0),
{Commands, State#state{next = Next}}.
info(StreamID, {switch_protocol, Headers, _, InitialState}, State) ->
do_info(StreamID, {switch_protocol, Headers, rabbit_web_stomp_handler, InitialState}, State);
info(StreamID, Info, State) ->
do_info(StreamID, Info, State).
do_info(StreamID, Info, State = #state{next = Next0}) ->
{Commands, Next} = cowboy_stream:info(StreamID, Info, Next0),
{Commands, State#state{next = Next}}.
terminate(StreamID, Reason, State = #state{next = Next}) ->
cowboy_stream:terminate(StreamID, Reason, Next).
early_error(StreamID, Reason, PartialReq, Resp, Opts) ->
cowboy_stream:early_error(StreamID, Reason, PartialReq, Resp, Opts).

2
deps/rabbitmq_web_stomp_examples/rabbitmq-components.mk vendored
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4

2
rabbitmq-components.mk
View File

@ -120,7 +120,7 @@ dep_jsx = hex 2.11.0
dep_lager = hex 3.9.1
dep_prometheus = git https://github.com/deadtrickster/prometheus.erl.git master
dep_ra = git https://github.com/rabbitmq/ra.git master
dep_ranch = hex 1.7.1
dep_ranch = hex 2.0.0
dep_recon = hex 2.5.1
dep_observer_cli = hex 1.6.1
dep_stdout_formatter = hex 0.2.4