summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Cogoluègnes <acogoluegnes@gmail.com>2020-10-23 15:36:09 +0200
committerArnaud Cogoluègnes <acogoluegnes@gmail.com>2020-10-23 15:36:09 +0200
commit016a714b607eb7b7620ab9142d3195dbe45bc071 (patch)
tree045c88ac9b72cb4fca9155dc758448bf0fb947b2
parent2a0126c9644b198d7521ba2b90d990ec1de34c5b (diff)
downloadrabbitmq-server-git-016a714b607eb7b7620ab9142d3195dbe45bc071.tar.gz
Rename process group to non_amqp_connection
-rw-r--r--src/rabbit.erl2
-rw-r--r--src/rabbit_networking.erl34
2 files changed, 18 insertions, 18 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 77bd439ce3..9248c945dc 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -1073,7 +1073,7 @@ force_event_refresh(Ref) ->
ok = rabbit_networking:force_connection_event_refresh(Ref),
% "external" connections, which are not handled by the "AMQP core",
% e.g. connections to the stream plugin
- ok = rabbit_networking:force_external_connection_event_refresh(Ref),
+ ok = rabbit_networking:force_non_amqp_connection_event_refresh(Ref),
ok = rabbit_channel:force_event_refresh(Ref),
ok = rabbit_amqqueue:force_event_refresh(Ref).
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index cd0be8bd91..433b1d7540 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -23,13 +23,13 @@
stop_tcp_listener/1, on_node_down/1, active_listeners/0,
node_listeners/1, node_client_listeners/1,
register_connection/1, unregister_connection/1,
- register_external_connection/1, unregister_external_connection/1,
- connections/0, external_connections/0, connection_info_keys/0,
+ register_non_amqp_connection/1, unregister_non_amqp_connection/1,
+ connections/0, non_amqp_connections/0, connection_info_keys/0,
connection_info/1, connection_info/2,
connection_info_all/0, connection_info_all/1,
emit_connection_info_all/4, emit_connection_info_local/3,
close_connection/2, close_connections/2, close_all_connections/1,
- force_connection_event_refresh/1, force_external_connection_event_refresh/1,
+ force_connection_event_refresh/1, force_non_amqp_connection_event_refresh/1,
handshake/2, tcp_host/1,
ranch_ref/1, ranch_ref/2, ranch_ref_of_protocol/1,
listener_of_protocol/1, stop_ranch_listener_of_protocol/1]).
@@ -44,7 +44,7 @@
-export([
local_connections/0,
- local_external_connections/0,
+ local_non_amqp_connections/0,
%% prefer local_connections/0
connections_local/0
]).
@@ -400,23 +400,23 @@ local_connections() ->
%% @deprecated Prefer {@link local_connections}
connections_local() -> pg_local:get_members(rabbit_connections).
--spec register_external_connection(pid()) -> ok.
+-spec register_non_amqp_connection(pid()) -> ok.
-register_external_connection(Pid) -> pg_local:join(rabbit_external_connections, Pid).
+register_non_amqp_connection(Pid) -> pg_local:join(rabbit_non_amqp_connections, Pid).
--spec unregister_external_connection(pid()) -> ok.
+-spec unregister_non_amqp_connection(pid()) -> ok.
-unregister_external_connection(Pid) -> pg_local:leave(rabbit_connections, Pid).
+unregister_non_amqp_connection(Pid) -> pg_local:leave(rabbit_non_amqp_connections, Pid).
--spec external_connections() -> [rabbit_types:connection()].
+-spec non_amqp_connections() -> [rabbit_types:connection()].
-external_connections() ->
+non_amqp_connections() ->
Nodes = rabbit_nodes:all_running(),
- rabbit_misc:append_rpc_all_nodes(Nodes, rabbit_networking, local_external_connections, [], ?RPC_TIMEOUT).
+ rabbit_misc:append_rpc_all_nodes(Nodes, rabbit_networking, local_non_amqp_connections, [], ?RPC_TIMEOUT).
--spec local_external_connections() -> [rabbit_types:connection()].
-local_external_connections() ->
- pg_local:get_members(rabbit_external_connections).
+-spec local_non_amqp_connections() -> [rabbit_types:connection()].
+local_non_amqp_connections() ->
+ pg_local:get_members(rabbit_non_amqp_connections).
-spec connection_info_keys() -> rabbit_types:info_keys().
@@ -482,9 +482,9 @@ force_connection_event_refresh(Ref) ->
[rabbit_reader:force_event_refresh(C, Ref) || C <- connections()],
ok.
--spec force_external_connection_event_refresh(reference()) -> 'ok'.
-force_external_connection_event_refresh(Ref) ->
- [gen_server:cast(Pid, {force_event_refresh, Ref}) || Pid <- external_connections()],
+-spec force_non_amqp_connection_event_refresh(reference()) -> 'ok'.
+force_non_amqp_connection_event_refresh(Ref) ->
+ [gen_server:cast(Pid, {force_event_refresh, Ref}) || Pid <- non_amqp_connections()],
ok.
-spec failed_to_recv_proxy_header(_, _) -> no_return().