Merge branch 'fix-dialyzer-errors-part2' into v3.7.x

Author: dumbbell

mk/rabbitmq-build.mk

@@ -29,9 +29,11 @@ endif
 
 TEST_ERLC_OPTS += +nowarn_export_all
 
+ifneq ($(PROJECT),rabbit_common)
 # Add the CLI ebin directory to the code path for the compiler: plugin
 # CLI extensions may access behaviour modules defined in this directory.
 RMQ_ERLC_OPTS += -pa $(DEPS_DIR)/rabbitmq_cli/_build/dev/lib/rabbitmqctl/ebin
+endif
 
 # Add Lager parse_transform module and our default Lager extra sinks.
 LAGER_EXTRA_SINKS += rabbit_log \

src/lager_forwarder_backend.erl

@@ -23,7 +23,7 @@
 
 -record(state, {
     next_sink :: atom(),
-    level :: {'mask', integer()}
+    level :: {'mask', integer()} | inherit
   }).
 
 %% @private

src/rabbit_control_misc.erl

@@ -91,19 +91,19 @@ step_with_exit_handler(AggregatorPid, Ref, Fun, Item) ->
 %% processes. await_emitters_termination/1 helper can be used as a
 %% last statement of remote function to ensure this behaviour.
 spawn_emitter_caller(Node, Mod, Fun, Args, Ref, Pid, Timeout) ->
-    spawn_monitor(
-      fun () ->
-              case rpc_call_emitter(Node, Mod, Fun, Args, Ref, Pid, Timeout) of
-                  {error, _} = Error        ->
-                      Pid ! {Ref, error, Error};
-                  {bad_argument, _} = Error ->
-                      Pid ! {Ref, error, Error};
-                  {badrpc, _} = Error       ->
-                      Pid ! {Ref, error, Error};
-                  _                         ->
-                      ok
-              end
-      end),
+    _ = spawn_monitor(
+          fun () ->
+                  case rpc_call_emitter(Node, Mod, Fun, Args, Ref, Pid, Timeout) of
+                      {error, _} = Error        ->
+                          Pid ! {Ref, error, Error};
+                      {bad_argument, _} = Error ->
+                          Pid ! {Ref, error, Error};
+                      {badrpc, _} = Error       ->
+                          Pid ! {Ref, error, Error};
+                      _                         ->
+                          ok
+                  end
+          end),
     ok.
 
 rpc_call_emitter(Node, Mod, Fun, Args, Ref, Pid, Timeout) ->
@@ -143,7 +143,7 @@ collect_monitors([Monitor|Rest]) ->
 %% number of live nodes, but it's not mandatory - thus more generic
 %% name of 'ChunkCount' was chosen.
 wait_for_info_messages(Pid, Ref, Fun, Acc0, Timeout, ChunkCount) ->
-    notify_if_timeout(Pid, Ref, Timeout),
+    _ = notify_if_timeout(Pid, Ref, Timeout),
     wait_for_info_messages(Ref, Fun, Acc0, ChunkCount).
 
 wait_for_info_messages(Ref, Fun, Acc0, ChunksLeft) ->

src/rabbit_core_metrics.erl

@@ -150,43 +150,43 @@ channel_stats(reductions, Id, Value) ->
 
 channel_stats(exchange_stats, publish, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_exchange_metrics, Id, {2, Value}, {Id, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_exchange_metrics, Id, {2, Value}, {Id, 0, 0, 0, 0}),
     ok;
 channel_stats(exchange_stats, confirm, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_exchange_metrics, Id, {3, Value}, {Id, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_exchange_metrics, Id, {3, Value}, {Id, 0, 0, 0, 0}),
     ok;
 channel_stats(exchange_stats, return_unroutable, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_exchange_metrics, Id, {4, Value}, {Id, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_exchange_metrics, Id, {4, Value}, {Id, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_exchange_stats, publish, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_exchange_metrics, Id, Value, {Id, 0, 0}),
+    _ = ets:update_counter(channel_queue_exchange_metrics, Id, Value, {Id, 0, 0}),
     ok;
 channel_stats(queue_stats, get, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {2, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {2, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_stats, get_no_ack, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {3, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {3, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_stats, deliver, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {4, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {4, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_stats, deliver_no_ack, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {5, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {5, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_stats, redeliver, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {6, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {6, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok;
 channel_stats(queue_stats, ack, Id, Value) ->
     %% Includes delete marker
-    ets:update_counter(channel_queue_metrics, Id, {7, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
+    _ = ets:update_counter(channel_queue_metrics, Id, {7, Value}, {Id, 0, 0, 0, 0, 0, 0, 0}),
     ok.
 
 delete(Table, Key) ->

src/rabbit_net.erl

@@ -40,7 +40,7 @@
                  {raw, non_neg_integer(), non_neg_integer(), binary()}].
 -type hostname() :: inet:hostname().
 -type ip_port() :: inet:port_number().
--type host_or_ip() :: binary() | inet:ip_address().
+% -type host_or_ip() :: binary() | inet:ip_address().
 -spec is_ssl(socket()) -> boolean().
 -spec ssl_info(socket()) -> 'nossl' | ok_val_or_error([{atom(), any()}]).
 -spec controlling_process(socket(), pid()) -> ok_or_any_error().
@@ -75,11 +75,14 @@
           'nossl' | ok_val_or_error(rabbit_ssl:certificate()).
 -spec connection_string(socket(), 'inbound' | 'outbound') ->
           ok_val_or_error(string()).
--spec socket_ends(socket(), 'inbound' | 'outbound') ->
-          ok_val_or_error({host_or_ip(), ip_port(),
-                           host_or_ip(), ip_port()}).
+% -spec socket_ends(socket() | ranch_proxy:proxy_socket() | ranch_proxy_ssl:ssl_socket(),
+%                   'inbound' | 'outbound') ->
+%           ok_val_or_error({host_or_ip(), ip_port(),
+%                            host_or_ip(), ip_port()}).
 -spec is_loopback(socket() | inet:ip_address()) -> boolean().
--spec unwrap_socket(socket() | ranch_proxy:proxy_socket() | ranch_proxy_ssl:ssl_socket()) -> socket().
+% -spec unwrap_socket(socket() | ranch_proxy:proxy_socket() | ranch_proxy_ssl:ssl_socket()) -> socket().
+
+-dialyzer({nowarn_function, [socket_ends/2, unwrap_socket/1]}).
 
 %%---------------------------------------------------------------------------
 

src/rabbit_nodes_common.erl

@@ -45,7 +45,7 @@ names(Hostname) ->
     Ref = make_ref(),
     {Pid, MRef} = spawn_monitor(
                     fun () -> Self ! {Ref, net_adm:names(Hostname)} end),
-    timer:exit_after(?EPMD_TIMEOUT, Pid, timeout),
+    _ = timer:exit_after(?EPMD_TIMEOUT, Pid, timeout),
     receive
         {Ref, Names}                         -> erlang:demonitor(MRef, [flush]),
                                                 Names;