Remove commented out code

3 files changed, 4 insertions, 19 deletions

diff --git a/src/rabbit_health_check.erl b/src/rabbit_health_check.erl
index d6e9756c62..7d2d1d3ea6 100644
--- a/src/rabbit_health_check.erl
+++ b/src/rabbit_health_check.erl
@@ -51,15 +51,10 @@ run_checks([C|Cs]) ->
             Error
     end.
 
-%% A lot of health checks seem to not be able to fail anymore.
 node_health_check(list_channels) ->
     case rabbit_channel:info_local([pid]) of
         L when is_list(L) ->
-            ok%;
-%        Other ->
-%            ErrorMsg = io_lib:format("list_channels unexpected output: ~p",
-%                                     [Other]),
-%            {error_string, ErrorMsg}
+            ok
     end;
 
 node_health_check(list_queues) ->
@@ -68,11 +63,7 @@ node_health_check(list_queues) ->
 node_health_check(rabbit_node_monitor) ->
     case rabbit_node_monitor:partitions() of
         L when is_list(L) ->
-            ok%;
-%        Other ->
-%            ErrorMsg = io_lib:format("rabbit_node_monitor reports unexpected partitions value: ~p",
-%                                     [Other]),
-%            {error_string, ErrorMsg}
+            ok
     end;
 
 node_health_check(alarms) ->
@@ -89,9 +80,5 @@ health_check_queues([]) ->
 health_check_queues([VHost|RestVHosts]) ->
     case rabbit_amqqueue:info_local(VHost) of
         L when is_list(L) ->
-            health_check_queues(RestVHosts)%;
-%        Other ->
-%            ErrorMsg = io_lib:format("list_queues unexpected output for vhost ~s: ~p",
-%                                     [VHost, Other]),
-%            {error_string, ErrorMsg}
+            health_check_queues(RestVHosts)
     end.
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 5fb42028b0..ed2e2ce389 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -285,8 +285,7 @@ tcp_listener_stopped(Protocol, Opts, IPAddress, Port) ->
                      port = Port,
                      opts = Opts}).
 
-%% @todo Temporary, to be removed before merge. Real fix is
-%% in an OTP PR at https://github.com/erlang/otp/pull/2117
+%% @todo Remove once Dialyzer only runs on Erlang/OTP 21.3 or above.
 -dialyzer({nowarn_function, record_distribution_listener/0}).
 
 record_distribution_listener() ->
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index dd882a0856..3a2d4650ca 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -462,7 +462,6 @@ log_connection_exception(Severity, Name, Ex) ->
 log_connection_exception_with_severity(Severity, Fmt, Args) ->
     case Severity of
         debug   -> rabbit_log_connection:debug(Fmt, Args);
-%        info    -> rabbit_log_connection:info(Fmt, Args);
         warning -> rabbit_log_connection:warning(Fmt, Args);
         error   -> rabbit_log_connection:error(Fmt, Args)
     end.