diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2020-09-02 05:16:07 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2020-09-02 05:16:07 +0300 |
| commit | 5425fbbabee6a8bd5c0ac162ba47f1f5da96e948 (patch) | |
| tree | 1a98cf75ab63dc3578349b9cf897feef6190bf6d | |
| parent | 32b0c21039bec7bb839afdd6e0e9fd4297a12822 (diff) | |
| parent | e840eb23a14dadc26b248d5727dc9d676c121739 (diff) | |
| download | rabbitmq-server-git-5425fbbabee6a8bd5c0ac162ba47f1f5da96e948.tar.gz | |
Merge branch 'lrb-add-multicall-timeout-to-force-event-refresh'
Conflicts:
src/rabbit_channel.erl
src/rabbit_direct.erl
src/rabbit_networking.erl
| -rw-r--r-- | src/rabbit_channel.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_direct.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index b65912710f..74d400950e 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -42,6 +42,8 @@ -include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). +-include_lib("rabbit_common/include/rabbit_misc.hrl"). + -include("amqqueue.hrl"). -behaviour(gen_server2). @@ -352,8 +354,8 @@ send_drained(Pid, CTagCredit) -> -spec list() -> [pid()]. list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_nodes:all_running(), - rabbit_channel, list_local, []). + Nodes = rabbit_nodes:all_running(), + rabbit_misc:append_rpc_all_nodes(Nodes, rabbit_channel, list_local, [], ?RPC_TIMEOUT). -spec list_local() -> [pid()]. diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index f08a29f829..3fc2d75908 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -19,6 +19,7 @@ -export([extract_extra_auth_props/4]). -include("rabbit.hrl"). +-include("rabbit_misc.hrl"). %%---------------------------------------------------------------------------- @@ -43,8 +44,8 @@ list_local() -> -spec list() -> [pid()]. list() -> - rabbit_misc:append_rpc_all_nodes(rabbit_nodes:all_running(), - rabbit_direct, list_local, []). + Nodes = rabbit_nodes:all_running(), + rabbit_misc:append_rpc_all_nodes(Nodes, rabbit_direct, list_local, [], ?RPC_TIMEOUT). %%---------------------------------------------------------------------------- diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index a9a89434b1..e0041e619f 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -47,6 +47,7 @@ ]). -include("rabbit.hrl"). +-include("rabbit_misc.hrl"). %% IANA-suggested ephemeral port range is 49152 to 65535 -define(FIRST_TEST_BIND_PORT, 49152). @@ -384,8 +385,8 @@ unregister_connection(Pid) -> pg_local:leave(rabbit_connections, Pid). -spec connections() -> [rabbit_types:connection()]. connections() -> - rabbit_misc:append_rpc_all_nodes(rabbit_nodes:all_running(), - rabbit_networking, connections_local, []). + Nodes = rabbit_nodes:all_running(), + rabbit_misc:append_rpc_all_nodes(Nodes, rabbit_networking, connections_local, [], ?RPC_TIMEOUT). -spec local_connections() -> [rabbit_types:connection()]. %% @doc Returns pids of AMQP 0-9-1 and AMQP 1.0 connections local to this node. |