Skip to content

Commit 3b6ece2

Browse files
committed
Remove commented out code
1 parent 28fc8ee commit 3b6ece2

File tree

3 files changed

+4
-19
lines changed

3 files changed

+4
-19
lines changed

src/rabbit_health_check.erl

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,10 @@ run_checks([C|Cs]) ->
5151
Error
5252
end.
5353

54-
%% A lot of health checks seem to not be able to fail anymore.
5554
node_health_check(list_channels) ->
5655
case rabbit_channel:info_local([pid]) of
5756
L when is_list(L) ->
58-
ok%;
59-
% Other ->
60-
% ErrorMsg = io_lib:format("list_channels unexpected output: ~p",
61-
% [Other]),
62-
% {error_string, ErrorMsg}
57+
ok
6358
end;
6459

6560
node_health_check(list_queues) ->
@@ -68,11 +63,7 @@ node_health_check(list_queues) ->
6863
node_health_check(rabbit_node_monitor) ->
6964
case rabbit_node_monitor:partitions() of
7065
L when is_list(L) ->
71-
ok%;
72-
% Other ->
73-
% ErrorMsg = io_lib:format("rabbit_node_monitor reports unexpected partitions value: ~p",
74-
% [Other]),
75-
% {error_string, ErrorMsg}
66+
ok
7667
end;
7768

7869
node_health_check(alarms) ->
@@ -89,9 +80,5 @@ health_check_queues([]) ->
8980
health_check_queues([VHost|RestVHosts]) ->
9081
case rabbit_amqqueue:info_local(VHost) of
9182
L when is_list(L) ->
92-
health_check_queues(RestVHosts)%;
93-
% Other ->
94-
% ErrorMsg = io_lib:format("list_queues unexpected output for vhost ~s: ~p",
95-
% [VHost, Other]),
96-
% {error_string, ErrorMsg}
83+
health_check_queues(RestVHosts)
9784
end.

src/rabbit_networking.erl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,7 @@ tcp_listener_stopped(Protocol, Opts, IPAddress, Port) ->
285285
port = Port,
286286
opts = Opts}).
287287

288-
%% @todo Temporary, to be removed before merge. Real fix is
289-
%% in an OTP PR at https://github.com/erlang/otp/pull/2117
288+
%% @todo Remove once Dialyzer only runs on Erlang/OTP 21.3 or above.
290289
-dialyzer({nowarn_function, record_distribution_listener/0}).
291290

292291
record_distribution_listener() ->

src/rabbit_reader.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,6 @@ log_connection_exception(Severity, Name, Ex) ->
462462
log_connection_exception_with_severity(Severity, Fmt, Args) ->
463463
case Severity of
464464
debug -> rabbit_log_connection:debug(Fmt, Args);
465-
% info -> rabbit_log_connection:info(Fmt, Args);
466465
warning -> rabbit_log_connection:warning(Fmt, Args);
467466
error -> rabbit_log_connection:error(Fmt, Args)
468467
end.

0 commit comments

Comments
 (0)