From 7c0f04067fb1238ff4cb4d45ee499165e62e5dc2 Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Mon, 23 Jan 2023 22:26:14 +0100 Subject: [PATCH] Fix all dialyzer warnings in `rabbit` --- deps/rabbit/BUILD.bazel | 4 ++-- deps/rabbit/src/pg_local.erl | 4 ++-- deps/rabbit/src/rabbit.erl | 13 ++++------- deps/rabbit/src/rabbit_alarm.erl | 2 +- deps/rabbit/src/rabbit_amqqueue.erl | 4 ++-- deps/rabbit/src/rabbit_amqqueue_process.erl | 13 +++++++---- .../src/rabbit_auth_backend_internal.erl | 10 ++++---- deps/rabbit/src/rabbit_autoheal.erl | 15 ++++++------ deps/rabbit/src/rabbit_binding.erl | 14 ++++++----- deps/rabbit/src/rabbit_channel.erl | 14 +++++------ .../rabbit/src/rabbit_channel_interceptor.erl | 2 +- deps/rabbit/src/rabbit_channel_tracking.erl | 15 +++++++----- deps/rabbit/src/rabbit_classic_queue.erl | 5 ++-- .../src/rabbit_classic_queue_index_v2.erl | 4 ++-- .../src/rabbit_classic_queue_store_v2.erl | 2 +- .../rabbit/src/rabbit_connection_tracking.erl | 17 +++++++------- deps/rabbit/src/rabbit_core_ff.erl | 2 +- deps/rabbit/src/rabbit_core_metrics_gc.erl | 2 +- deps/rabbit/src/rabbit_db_user.erl | 4 ++-- deps/rabbit/src/rabbit_definitions.erl | 23 +++++++++++-------- .../src/rabbit_definitions_import_https.erl | 4 ++-- ...it_definitions_import_local_filesystem.erl | 2 +- deps/rabbit/src/rabbit_direct.erl | 2 +- deps/rabbit/src/rabbit_disk_monitor.erl | 10 +++----- deps/rabbit/src/rabbit_event_consumer.erl | 4 ++-- deps/rabbit/src/rabbit_exchange.erl | 6 ++--- deps/rabbit/src/rabbit_exchange_decorator.erl | 2 +- .../rabbit/src/rabbit_exchange_parameters.erl | 2 +- .../rabbit/src/rabbit_exchange_type_topic.erl | 2 +- deps/rabbit/src/rabbit_ff_registry.erl | 12 +++++----- deps/rabbit/src/rabbit_fifo_client.erl | 2 +- deps/rabbit/src/rabbit_fifo_dlx_worker.erl | 4 ++-- deps/rabbit/src/rabbit_limiter.erl | 2 +- deps/rabbit/src/rabbit_log_tail.erl | 2 +- deps/rabbit/src/rabbit_logger_exchange_h.erl | 2 +- deps/rabbit/src/rabbit_maintenance.erl | 4 ++-- deps/rabbit/src/rabbit_memory_monitor.erl | 2 +- deps/rabbit/src/rabbit_mirror_queue_misc.erl | 13 ++++++----- deps/rabbit/src/rabbit_mirror_queue_slave.erl | 11 +++++---- deps/rabbit/src/rabbit_mirror_queue_sync.erl | 4 ++-- deps/rabbit/src/rabbit_mnesia.erl | 13 ++++++----- deps/rabbit/src/rabbit_mnesia_rename.erl | 8 +++---- deps/rabbit/src/rabbit_msg_store.erl | 8 +++---- .../rabbit/src/rabbit_msg_store_ets_index.erl | 4 ++-- deps/rabbit/src/rabbit_networking.erl | 5 ++-- deps/rabbit/src/rabbit_node_monitor.erl | 11 +++++---- deps/rabbit/src/rabbit_nodes.erl | 4 ++-- .../rabbit_observer_cli_classic_queues.erl | 2 +- deps/rabbit/src/rabbit_osiris_metrics.erl | 2 +- deps/rabbit/src/rabbit_peer_discovery.erl | 2 +- deps/rabbit/src/rabbit_plugins.erl | 12 +++++----- deps/rabbit/src/rabbit_policy.erl | 10 ++++---- deps/rabbit/src/rabbit_prelaunch_logging.erl | 12 +++++----- deps/rabbit/src/rabbit_queue_consumers.erl | 8 +++---- deps/rabbit/src/rabbit_queue_decorator.erl | 2 +- deps/rabbit/src/rabbit_queue_index.erl | 8 +++---- deps/rabbit/src/rabbit_quorum_queue.erl | 3 ++- deps/rabbit/src/rabbit_reader.erl | 14 ++++++----- deps/rabbit/src/rabbit_recovery_terms.erl | 8 ++++--- deps/rabbit/src/rabbit_runtime_parameters.erl | 4 ++-- deps/rabbit/src/rabbit_stream_coordinator.erl | 2 +- deps/rabbit/src/rabbit_stream_queue.erl | 2 +- deps/rabbit/src/rabbit_table.erl | 11 +++++---- deps/rabbit/src/rabbit_time_travel_dbg.erl | 5 ++-- deps/rabbit/src/rabbit_variable_queue.erl | 3 ++- deps/rabbit/src/rabbit_vhost.erl | 6 ++--- deps/rabbit/src/rabbit_vhost_process.erl | 2 +- deps/rabbit/src/rabbit_vhost_sup_sup.erl | 4 ++-- deps/rabbit_common/src/supervisor2.erl | 2 +- 69 files changed, 230 insertions(+), 208 deletions(-) diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index fa0bd230a0c3..585aa2e70b30 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -200,6 +200,7 @@ xref() plt_apps = [ "mnesia", + "runtime_tools", ] + EXTRA_APPS plt_apps.remove("rabbitmq_prelaunch") @@ -208,13 +209,12 @@ plt( name = "base_plt", apps = plt_apps, plt = "//:base_plt", - deps = DEPS, + deps = DEPS + RUNTIME_DEPS, ) dialyze( dialyzer_opts = RABBITMQ_DIALYZER_OPTS, plt = ":base_plt", - warnings_as_errors = False, ) bats( diff --git a/deps/rabbit/src/pg_local.erl b/deps/rabbit/src/pg_local.erl index c7aabb991ea5..3fc2220acd80 100644 --- a/deps/rabbit/src/pg_local.erl +++ b/deps/rabbit/src/pg_local.erl @@ -163,7 +163,7 @@ terminate(_Reason, _S) -> %%% Pid is a member of group Name. member_died(Ref, Pid) -> - case ets:lookup(?TABLE, {ref, Ref}) of + _ = case ets:lookup(?TABLE, {ref, Ref}) of [{{ref, Ref}, Pid}] -> leave_all_groups(Pid); %% in case the key has already been removed @@ -181,7 +181,7 @@ leave_all_groups(Pid) -> join_group(Name, Pid) -> Ref_Pid = {ref, Pid}, - try _ = ets:update_counter(?TABLE, Ref_Pid, {3, +1}) + _ = try ets:update_counter(?TABLE, Ref_Pid, {3, +1}) catch _:_ -> Ref = erlang:monitor(process, Pid), true = ets:insert(?TABLE, {Ref_Pid, Ref, 1}), diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index c84530deb27d..9d5bb05bda6b 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -589,7 +589,7 @@ await_startup(Node, PrintProgressReports) -> false -> case is_running(Node) of true -> ok; - false -> wait_for_boot_to_start(Node), + false -> _ = _ = wait_for_boot_to_start(Node), wait_for_boot_to_finish(Node, PrintProgressReports) end end. @@ -602,7 +602,7 @@ await_startup(Node, PrintProgressReports, Timeout) -> false -> case is_running(Node) of true -> ok; - false -> wait_for_boot_to_start(Node, Timeout), + false -> _ = wait_for_boot_to_start(Node, Timeout), wait_for_boot_to_finish(Node, PrintProgressReports, Timeout) end end. @@ -681,10 +681,7 @@ maybe_print_boot_progress(true, IterationsLeft) -> status() -> Version = base_product_version(), - CryptoLibInfo = case crypto:info_lib() of - [Tuple] when is_tuple(Tuple) -> Tuple; - Tuple when is_tuple(Tuple) -> Tuple - end, + [CryptoLibInfo] = crypto:info_lib(), SeriesSupportStatus = rabbit_release_series:readable_support_status(), S1 = [{pid, list_to_integer(os:getpid())}, %% The timeout value used is twice that of gen_server:call/2. @@ -951,13 +948,13 @@ start(normal, []) -> {ok, SupPid} catch throw:{error, _} = Error -> - mnesia:stop(), + _ = mnesia:stop(), rabbit_prelaunch_errors:log_error(Error), rabbit_prelaunch:set_stop_reason(Error), rabbit_boot_state:set(stopped), Error; Class:Exception:Stacktrace -> - mnesia:stop(), + _ = mnesia:stop(), rabbit_prelaunch_errors:log_exception( Class, Exception, Stacktrace), Error = {error, Exception}, diff --git a/deps/rabbit/src/rabbit_alarm.erl b/deps/rabbit/src/rabbit_alarm.erl index c4b777c97d17..4e908200772b 100644 --- a/deps/rabbit/src/rabbit_alarm.erl +++ b/deps/rabbit/src/rabbit_alarm.erl @@ -313,7 +313,7 @@ alert(Alertees, Source, Alert, NodeComparator) -> internal_register(Pid, {M, F, A} = AlertMFA, State = #alarms{alertees = Alertees}) -> _MRef = erlang:monitor(process, Pid), - case dict:find(node(), State#alarms.alarmed_nodes) of + _ = case dict:find(node(), State#alarms.alarmed_nodes) of {ok, Sources} -> [apply(M, F, A ++ [Pid, R, {true, true, node()}]) || R <- Sources]; error -> ok end, diff --git a/deps/rabbit/src/rabbit_amqqueue.erl b/deps/rabbit/src/rabbit_amqqueue.erl index ad3382968902..880992a03845 100644 --- a/deps/rabbit/src/rabbit_amqqueue.erl +++ b/deps/rabbit/src/rabbit_amqqueue.erl @@ -1609,7 +1609,7 @@ stat(Q) -> rabbit_queue_type:stat(Q). -spec pid_of(amqqueue:amqqueue()) -> - pid(). + pid() | 'none'. pid_of(Q) -> amqqueue:get_pid(Q). @@ -1862,7 +1862,7 @@ forget_all_durable(Node) -> fun () -> Qs = mnesia:match_object(rabbit_durable_queue, amqqueue:pattern_match_all(), write), - [forget_node_for_queue(Node, Q) || + _ = [forget_node_for_queue(Node, Q) || Q <- Qs, is_local_to_node(amqqueue:get_pid(Q), Node)], ok diff --git a/deps/rabbit/src/rabbit_amqqueue_process.erl b/deps/rabbit/src/rabbit_amqqueue_process.erl index a6370a2dd369..08cacb762fdd 100644 --- a/deps/rabbit/src/rabbit_amqqueue_process.erl +++ b/deps/rabbit/src/rabbit_amqqueue_process.erl @@ -261,7 +261,7 @@ recovery_barrier(BarrierPid) -> init_with_backing_queue_state(Q, BQ, BQS, RateTRef, Deliveries, Senders, MTC) -> Owner = amqqueue:get_exclusive_owner(Q), - case Owner of + _ = case Owner of none -> ok; _ -> erlang:monitor(process, Owner) end, @@ -382,14 +382,17 @@ code_change(_OldVsn, State, _Extra) -> maybe_notify_decorators(false, State) -> State; maybe_notify_decorators(true, State) -> notify_decorators(State), State. -notify_decorators(Event, State) -> decorator_callback(qname(State), Event, []). +notify_decorators(Event, State) -> + _ = decorator_callback(qname(State), Event, []), + ok. notify_decorators(State = #q{consumers = Consumers, backing_queue = BQ, backing_queue_state = BQS}) -> P = rabbit_queue_consumers:max_active_priority(Consumers), - decorator_callback(qname(State), consumer_state_changed, - [P, BQ:is_empty(BQS)]). + _ = decorator_callback(qname(State), consumer_state_changed, + [P, BQ:is_empty(BQS)]), + ok. decorator_callback(QName, F, A) -> %% Look up again in case policy and hence decorators have changed @@ -719,7 +722,7 @@ maybe_deliver_or_enqueue(Delivery = #delivery{message = Message}, send_reject_publish(Delivery, Delivered, State); {true, 'reject-publish-dlx'} -> %% Publish to DLX - with_dlx( + _ = with_dlx( DLX, fun (X) -> rabbit_global_counters:messages_dead_lettered(maxlen, rabbit_classic_queue, diff --git a/deps/rabbit/src/rabbit_auth_backend_internal.erl b/deps/rabbit/src/rabbit_auth_backend_internal.erl index a1f21888f76b..93c1b9e26a25 100644 --- a/deps/rabbit/src/rabbit_auth_backend_internal.erl +++ b/deps/rabbit/src/rabbit_auth_backend_internal.erl @@ -453,7 +453,7 @@ set_permissions(Username, VirtualHost, ConfigurePerm, WritePerm, ReadPerm, Actin rabbit_log:debug("Asked to set permissions for " "'~ts' in virtual host '~ts' to '~ts', '~ts', '~ts'", [Username, VirtualHost, ConfigurePerm, WritePerm, ReadPerm]), - lists:map( + _ = lists:map( fun (RegexpBin) -> Regexp = binary_to_list(RegexpBin), case re:compile(Regexp) of @@ -538,7 +538,7 @@ set_topic_permissions(Username, VirtualHost, Exchange, WritePerm, ReadPerm, Acti [Exchange, Username, VirtualHost, WritePerm, ReadPerm]), WritePermRegex = rabbit_data_coercion:to_binary(WritePerm), ReadPermRegex = rabbit_data_coercion:to_binary(ReadPerm), - lists:map( + _ = lists:map( fun (RegexpBin) -> case re:compile(RegexpBin) of {ok, _} -> ok; @@ -720,9 +720,9 @@ update_user_password_hash(Username, PasswordHash, Tags, Limits, User, Version) - Username, Hash, HashingAlgorithm, ConvertedTags, Limits). create_user_with_password(_PassedCredentialValidation = true, Username, Password, Tags, undefined, Limits, ActingUser) -> - rabbit_auth_backend_internal:add_user(Username, Password, ActingUser, Limits, Tags); + ok = rabbit_auth_backend_internal:add_user(Username, Password, ActingUser, Limits, Tags); create_user_with_password(_PassedCredentialValidation = true, Username, Password, Tags, PreconfiguredPermissions, Limits, ActingUser) -> - rabbit_auth_backend_internal:add_user(Username, Password, ActingUser, Limits, Tags), + ok = rabbit_auth_backend_internal:add_user(Username, Password, ActingUser, Limits, Tags), preconfigure_permissions(Username, PreconfiguredPermissions, ActingUser); create_user_with_password(_PassedCredentialValidation = false, _Username, _Password, _Tags, _, _, _) -> %% we don't log here because @@ -741,7 +741,7 @@ create_user_with_password_hash(Username, PasswordHash, Tags, User, Version, Prec preconfigure_permissions(_Username, undefined, _ActingUser) -> ok; preconfigure_permissions(Username, Map, ActingUser) when is_map(Map) -> - maps:map(fun(VHost, M) -> + _ = maps:map(fun(VHost, M) -> rabbit_auth_backend_internal:set_permissions(Username, VHost, maps:get(<<"configure">>, M), maps:get(<<"write">>, M), diff --git a/deps/rabbit/src/rabbit_autoheal.erl b/deps/rabbit/src/rabbit_autoheal.erl index 2a87f3e5a0aa..c7f5743eec0a 100644 --- a/deps/rabbit/src/rabbit_autoheal.erl +++ b/deps/rabbit/src/rabbit_autoheal.erl @@ -119,7 +119,8 @@ init() -> {leader_waiting, Winner, _} -> rabbit_log:info( "Autoheal: in progress, requesting report from ~tp", [Winner]), - send(Winner, report_autoheal_status); + _ = send(Winner, report_autoheal_status), + ok; _ -> ok end, @@ -128,7 +129,7 @@ init() -> maybe_start(not_healing) -> case enabled() of true -> Leader = leader(), - send(Leader, {request_start, node()}), + _ = send(Leader, {request_start, node()}), rabbit_log:info("Autoheal request sent to ~tp", [Leader]), not_healing; false -> not_healing @@ -216,7 +217,7 @@ handle_msg({request_start, Node}, case node() =:= Winner of true -> handle_msg({become_winner, Losers}, not_healing, Partitions); - false -> send(Winner, {become_winner, Losers}), + false -> _ = send(Winner, {become_winner, Losers}), {leader_waiting, Winner, Losers} end end; @@ -272,7 +273,7 @@ handle_msg(report_autoheal_status, not_healing, _Partitions) -> %% winner). This happens when the leader is a loser and it just %% restarted. We are in the "not_healing" state, so the previous %% autoheal process ended: let's tell this to the leader. - send(leader(), {autoheal_finished, node()}), + _ = send(leader(), {autoheal_finished, node()}), not_healing; handle_msg(report_autoheal_status, State, _Partitions) -> @@ -329,7 +330,7 @@ winner_finish(Notify) -> %% losing nodes before sending the "autoheal_safe_to_start" signal. wait_for_mnesia_shutdown(Notify), [{rabbit_outside_app_process, N} ! autoheal_safe_to_start || N <- Notify], - send(leader(), {autoheal_finished, node()}), + _ = send(leader(), {autoheal_finished, node()}), not_healing. %% This improves the previous implementation, but could still potentially enter an infinity @@ -355,7 +356,7 @@ wait_for_supervisors(Monitors) -> AliveLosers = [Node || {_, Node} <- pmon:monitored(Monitors)], rabbit_log:info("Autoheal: mnesia in nodes ~tp is still up, sending " "winner notification again to these ", [AliveLosers]), - [send(L, {winner_is, node()}) || L <- AliveLosers], + _ = [send(L, {winner_is, node()}) || L <- AliveLosers], wait_for_mnesia_shutdown(AliveLosers) end end. @@ -449,7 +450,7 @@ stop_partition(Losers) -> %% give up. Down = Losers -- rabbit_node_monitor:alive_rabbit_nodes(Losers), case Down of - [] -> [send(L, {winner_is, node()}) || L <- Losers], + [] -> _ = [send(L, {winner_is, node()}) || L <- Losers], {winner_waiting, Losers, Losers}; _ -> abort(Down, Losers) end. diff --git a/deps/rabbit/src/rabbit_binding.erl b/deps/rabbit/src/rabbit_binding.erl index f615b9376ab3..f998903a51ff 100644 --- a/deps/rabbit/src/rabbit_binding.erl +++ b/deps/rabbit/src/rabbit_binding.erl @@ -80,8 +80,8 @@ new(Src, RoutingKey, Dst, Arguments) -> recover() -> rabbit_misc:execute_mnesia_transaction( fun () -> - mnesia:lock({table, rabbit_durable_route}, read), - mnesia:lock({table, rabbit_semi_durable_route}, write), + _ = mnesia:lock({table, rabbit_durable_route}, read), + _ = mnesia:lock({table, rabbit_semi_durable_route}, write), Routes = rabbit_misc:dirty_read_all(rabbit_durable_route), Fun = fun(Route) -> mnesia:dirty_write(rabbit_semi_durable_route, Route) @@ -545,7 +545,7 @@ remove_routes(Routes, ShouldIndexTable) -> R <- SemiDurableRoutes], [ok = sync_route(R, false, false, ShouldIndexTable, fun delete/3) || R <- RamOnlyRoutes], - case ShouldIndexTable of + _ = case ShouldIndexTable of B when is_boolean(B) -> ok; undefined -> @@ -603,8 +603,9 @@ remove_for_destination(DstName, OnlyDurable, Fun) -> lock_resource(Name) -> lock_resource(Name, write). lock_resource(Name, LockKind) -> - mnesia:lock({global, Name, mnesia:table_info(rabbit_route, where_to_write)}, - LockKind). + _ = mnesia:lock({global, Name, mnesia:table_info(rabbit_route, where_to_write)}, + LockKind), + ok. %% Requires that its input binding list is sorted in exchange-name %% order, so that the grouping of bindings (for passing to @@ -739,7 +740,8 @@ process_deletions(Deletions, ActingUser) -> del_notify(Bs, ActingUser) -> [rabbit_event:notify( binding_deleted, info(B) ++ [{user_who_performed_action, ActingUser}]) - || B <- Bs]. + || B <- Bs], + ok. x_callback(Serial, X, F, Bs) -> ok = rabbit_exchange:callback(X, F, Serial, [X, Bs]). diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl index 6344bf0e659f..2366437102f9 100644 --- a/deps/rabbit/src/rabbit_channel.erl +++ b/deps/rabbit/src/rabbit_channel.erl @@ -440,7 +440,7 @@ emit_info(PidList, InfoItems, Ref, AggregatorPid) -> -spec refresh_config_local() -> 'ok'. refresh_config_local() -> - rabbit_misc:upmap( + _ = rabbit_misc:upmap( fun (C) -> try gen_server2:call(C, refresh_config, infinity) @@ -454,7 +454,7 @@ refresh_config_local() -> ok. refresh_interceptors() -> - rabbit_misc:upmap( + _ = rabbit_misc:upmap( fun (C) -> try gen_server2:call(C, refresh_interceptors, ?REFRESH_TIMEOUT) @@ -779,7 +779,7 @@ handle_cast({queue_event, QRef, Evt}, %% Do not nack the "rejected" messages. State2 = record_confirms(ConfirmMXs, State1#ch{unconfirmed = UC1}), - erase_queue_stats(QRef), + _ = erase_queue_stats(QRef), noreply_coalesce( State2#ch{queue_states = rabbit_queue_type:remove(QRef, QueueStates0)}); {protocol_error, Type, Reason, ReasonArgs} -> @@ -830,7 +830,7 @@ handle_info({'DOWN', _MRef, process, QPid, Reason}, %% Do not nack the "rejected" messages. State2 = record_confirms(ConfirmMXs, State1#ch{unconfirmed = UC1}), - erase_queue_stats(QRef), + _ = erase_queue_stats(QRef), noreply_coalesce( State2#ch{queue_states = rabbit_queue_type:remove(QRef, State2#ch.queue_states)}) end; @@ -2233,7 +2233,7 @@ deliver_to_queues({Delivery = #delivery{message = Message = #basic_message{ex %% Actions must be processed after registering confirms as actions may %% contain rejections of publishes State = handle_queue_actions(Actions, State1#ch{queue_states = QueueStates}), - case rabbit_event:stats_level(State, #ch.stats_timer) of + _ = case rabbit_event:stats_level(State, #ch.stats_timer) of fine -> ?INCR_STATS(exchange_stats, XName, 1, publish), [?INCR_STATS(queue_exchange_stats, {QName, XName}, 1, publish) @@ -2717,7 +2717,7 @@ handle_method(#'exchange.declare'{exchange = ExchangeNameBin, X = case rabbit_exchange:lookup(ExchangeName) of {ok, FoundX} -> FoundX; {error, not_found} -> - check_name('exchange', strip_cr_lf(ExchangeNameBin)), + _ = check_name('exchange', strip_cr_lf(ExchangeNameBin)), AeKey = <<"alternate-exchange">>, case rabbit_misc:r_arg(VHostPath, exchange, Args, AeKey) of undefined -> ok; @@ -2776,7 +2776,7 @@ handle_deliver0(ConsumerTag, AckRequired, _ -> ok = rabbit_writer:send_command(WriterPid, Deliver, Content) end, - case GCThreshold of + _ = case GCThreshold of undefined -> ok; _ -> rabbit_basic:maybe_gc_large_msg(Content, GCThreshold) end, diff --git a/deps/rabbit/src/rabbit_channel_interceptor.erl b/deps/rabbit/src/rabbit_channel_interceptor.erl index f317bee7e08d..2410e5c6b013 100644 --- a/deps/rabbit/src/rabbit_channel_interceptor.erl +++ b/deps/rabbit/src/rabbit_channel_interceptor.erl @@ -48,7 +48,7 @@ check_no_overlap(Mods) -> %% Check no non-empty pairwise intersection in a list of sets check_no_overlap1(Sets) -> - lists:foldl(fun(Set, Union) -> + _ = lists:foldl(fun(Set, Union) -> Is = sets:intersection(Set, Union), case sets:size(Is) of 0 -> ok; diff --git a/deps/rabbit/src/rabbit_channel_tracking.erl b/deps/rabbit/src/rabbit_channel_tracking.erl index 1c2b908269f4..d9d6d0e82962 100644 --- a/deps/rabbit/src/rabbit_channel_tracking.erl +++ b/deps/rabbit/src/rabbit_channel_tracking.erl @@ -144,7 +144,8 @@ register_tracked_ets(TrackedCh = #tracked_channel{pid = ChPid, username = Userna case ets:lookup(?TRACKED_CHANNEL_TABLE, ChPid) of [] -> ets:insert(?TRACKED_CHANNEL_TABLE, TrackedCh), - ets:update_counter(?TRACKED_CHANNEL_TABLE_PER_USER, Username, 1, {Username, 0}); + ets:update_counter(?TRACKED_CHANNEL_TABLE_PER_USER, Username, 1, {Username, 0}), + ok; [#tracked_channel{}] -> ok end, @@ -158,7 +159,8 @@ register_tracked_mnesia(TrackedCh = case mnesia:dirty_read(TableName, ChId) of [] -> mnesia:dirty_write(TableName, TrackedCh), - mnesia:dirty_update_counter(PerUserChTableName, Username, 1); + mnesia:dirty_update_counter(PerUserChTableName, Username, 1), + ok; [#tracked_channel{}] -> ok end, @@ -326,8 +328,9 @@ tracked_channel_per_user_table_name_for(Node) -> "tracked_channel_table_per_user_on_node_~ts", [Node])). ensure_tracked_tables_for_this_node() -> - ensure_tracked_channels_table_for_this_node_ets(), - ensure_per_user_tracked_channels_table_for_this_node_ets(). + _ = ensure_tracked_channels_table_for_this_node_ets(), + _ = ensure_per_user_tracked_channels_table_for_this_node_ets(), + ok. %% internal ensure_tracked_channels_table_for_this_node() -> @@ -467,7 +470,7 @@ migrate_tracking_records() -> rabbit_misc:execute_mnesia_transaction( fun () -> Table = tracked_channel_table_name_for(Node), - mnesia:lock({table, Table}, read), + _ = mnesia:lock({table, Table}, read), Channels = mnesia:select(Table, [{'$1',[],['$1']}]), lists:foreach( fun(Channel) -> @@ -477,7 +480,7 @@ migrate_tracking_records() -> rabbit_misc:execute_mnesia_transaction( fun () -> Table = tracked_channel_per_user_table_name_for(Node), - mnesia:lock({table, Table}, read), + _ = mnesia:lock({table, Table}, read), Channels = mnesia:select(Table, [{'$1',[],['$1']}]), lists:foreach( fun(#tracked_channel_per_user{channel_count = C, diff --git a/deps/rabbit/src/rabbit_classic_queue.erl b/deps/rabbit/src/rabbit_classic_queue.erl index 71e4fc23142a..e349b5e57254 100644 --- a/deps/rabbit/src/rabbit_classic_queue.erl +++ b/deps/rabbit/src/rabbit_classic_queue.erl @@ -325,8 +325,9 @@ deliver(Qs0, #delivery{flow = Flow, %% process. We are accessing the rabbit_channel process %% dictionary. flow -> - [credit_flow:send(QPid) || QPid <- MPids], - [credit_flow:send(QPid) || QPid <- SPids]; + _ = [credit_flow:send(QPid) || QPid <- MPids], + _ = [credit_flow:send(QPid) || QPid <- SPids], + ok; noflow -> ok end, MMsg = {deliver, Delivery, false}, diff --git a/deps/rabbit/src/rabbit_classic_queue_index_v2.erl b/deps/rabbit/src/rabbit_classic_queue_index_v2.erl index 3d451958ac0d..d2e70324f337 100644 --- a/deps/rabbit/src/rabbit_classic_queue_index_v2.erl +++ b/deps/rabbit/src/rabbit_classic_queue_index_v2.erl @@ -217,7 +217,7 @@ reset_state(State = #qi{ queue_name = Name, on_sync = OnSyncFun, on_sync_msg = OnSyncMsgFun }) -> ?DEBUG("~0p", [State]), - delete_and_terminate(State), + _ = delete_and_terminate(State), init1(Name, rabbit_file:binary_to_filename(Dir), OnSyncFun, OnSyncMsgFun). -spec recover(rabbit_amqqueue:name(), shutdown_terms(), boolean(), @@ -542,7 +542,7 @@ terminate(VHost, Terms, State0 = #qi { dir = Dir, end, OpenFds), file_handle_cache:release_reservation(), %% Write recovery terms for faster recovery. - rabbit_recovery_terms:store(VHost, + _ = rabbit_recovery_terms:store(VHost, filename:basename(rabbit_file:binary_to_filename(Dir)), [{v2_index_state, {?VERSION, Segments}} | Terms]), State#qi{ segments = #{}, diff --git a/deps/rabbit/src/rabbit_classic_queue_store_v2.erl b/deps/rabbit/src/rabbit_classic_queue_store_v2.erl index 530c39b96ad4..84c24a486c88 100644 --- a/deps/rabbit/src/rabbit_classic_queue_store_v2.erl +++ b/deps/rabbit/src/rabbit_classic_queue_store_v2.erl @@ -445,7 +445,7 @@ get_read_fd(Segment, State = #qs{ read_fd = OldFd }) -> eof -> %% Something is wrong with the file. Close it %% and let the caller decide what to do with it. - file:close(Fd), + _ = file:close(Fd), {{error, bad_header}, State#qs{ read_segment = undefined, read_fd = undefined }} end; diff --git a/deps/rabbit/src/rabbit_connection_tracking.erl b/deps/rabbit/src/rabbit_connection_tracking.erl index 81c85b3eb18e..4bc1f91ed4eb 100644 --- a/deps/rabbit/src/rabbit_connection_tracking.erl +++ b/deps/rabbit/src/rabbit_connection_tracking.erl @@ -174,7 +174,7 @@ register_tracked(#tracked_connection{node = Node} = Conn) when Node =:= node() - end. register_tracked_ets(#tracked_connection{username = Username, vhost = VHost, id = ConnId} = Conn) -> - case ets:lookup(?TRACKED_CONNECTION_TABLE, ConnId) of + _ = case ets:lookup(?TRACKED_CONNECTION_TABLE, ConnId) of [] -> ets:insert(?TRACKED_CONNECTION_TABLE, Conn), ets:update_counter(?TRACKED_CONNECTION_TABLE_PER_VHOST, VHost, 1, {VHost, 0}), @@ -193,7 +193,8 @@ register_tracked_mnesia(#tracked_connection{username = Username, vhost = VHost, [] -> mnesia:dirty_write(TableName, Conn), mnesia:dirty_update_counter(PerVhostTableName, VHost, 1), - mnesia:dirty_update_counter(PerUserConnTableName, Username, 1); + mnesia:dirty_update_counter(PerUserConnTableName, Username, 1), + ok; [#tracked_connection{}] -> ok end, @@ -279,7 +280,7 @@ shutdown_tracked_items(TrackedItems, Message) -> ensure_tracked_tables_for_this_node() -> ensure_tracked_connections_table_for_this_node_ets(), - ensure_per_vhost_tracked_connections_table_for_this_node_ets(), + _ = ensure_per_vhost_tracked_connections_table_for_this_node_ets(), ensure_per_user_tracked_connections_table_for_this_node_ets(). -spec ensure_tracked_connections_table_for_this_node() -> ok. @@ -293,7 +294,7 @@ ensure_tracked_connections_table_for_this_node() -> end. ensure_tracked_connections_table_for_this_node_ets() -> - ets:new(?TRACKED_CONNECTION_TABLE, [named_table, public, {write_concurrency, true}, + _ = ets:new(?TRACKED_CONNECTION_TABLE, [named_table, public, {write_concurrency, true}, {keypos, #tracked_connection.id}]), rabbit_log:info("Setting up a table for connection tracking on this node: ~tp", [?TRACKED_CONNECTION_TABLE]). @@ -359,7 +360,7 @@ ensure_per_user_tracked_connections_table_for_this_node() -> end. ensure_per_user_tracked_connections_table_for_this_node_ets() -> - ets:new(?TRACKED_CONNECTION_TABLE_PER_USER, [named_table, public, {write_concurrency, true}]), + _ = ets:new(?TRACKED_CONNECTION_TABLE_PER_USER, [named_table, public, {write_concurrency, true}]), rabbit_log:info("Setting up a table for per-user connection counting on this node: ~tp", [?TRACKED_CONNECTION_TABLE_PER_USER]). @@ -733,7 +734,7 @@ migrate_tracking_records() -> rabbit_misc:execute_mnesia_transaction( fun () -> Table = tracked_connection_table_name_for(Node), - mnesia:lock({table, Table}, read), + _ = mnesia:lock({table, Table}, read), Connections = mnesia:select(Table, [{'$1',[],['$1']}]), lists:foreach( fun(Connection) -> @@ -743,7 +744,7 @@ migrate_tracking_records() -> rabbit_misc:execute_mnesia_transaction( fun () -> Table = tracked_connection_per_user_table_name_for(Node), - mnesia:lock({table, Table}, read), + _ = mnesia:lock({table, Table}, read), Connections = mnesia:select(Table, [{'$1',[],['$1']}]), lists:foreach( fun(#tracked_connection_per_user{connection_count = C, @@ -754,7 +755,7 @@ migrate_tracking_records() -> rabbit_misc:execute_mnesia_transaction( fun () -> Table = tracked_connection_per_vhost_table_name_for(Node), - mnesia:lock({table, Table}, read), + _ = mnesia:lock({table, Table}, read), Connections = mnesia:select(Table, [{'$1',[],['$1']}]), lists:foreach( fun(#tracked_connection_per_vhost{connection_count = C, diff --git a/deps/rabbit/src/rabbit_core_ff.erl b/deps/rabbit/src/rabbit_core_ff.erl index f301b74dfd1b..1ec4d5f06531 100644 --- a/deps/rabbit/src/rabbit_core_ff.erl +++ b/deps/rabbit/src/rabbit_core_ff.erl @@ -163,7 +163,7 @@ listener_records_in_ets_enable(#{feature_name := FeatureName}) -> try rabbit_misc:execute_mnesia_transaction( fun () -> - mnesia:lock({table, rabbit_listener}, read), + _ = mnesia:lock({table, rabbit_listener}, read), Listeners = mnesia:select( rabbit_listener, [{'$1',[],['$1']}]), lists:foreach( diff --git a/deps/rabbit/src/rabbit_core_metrics_gc.erl b/deps/rabbit/src/rabbit_core_metrics_gc.erl index 37f6bdbb7277..a7ffbcd2d933 100644 --- a/deps/rabbit/src/rabbit_core_metrics_gc.erl +++ b/deps/rabbit/src/rabbit_core_metrics_gc.erl @@ -40,7 +40,7 @@ handle_info(start_gc, State) -> {noreply, start_timer(State)}. terminate(_Reason, #state{timer = TRef}) -> - erlang:cancel_timer(TRef), + _ = erlang:cancel_timer(TRef), ok. code_change(_OldVsn, State, _Extra) -> diff --git a/deps/rabbit/src/rabbit_db_user.erl b/deps/rabbit/src/rabbit_db_user.erl index de13067cac3b..68b3561f05ea 100644 --- a/deps/rabbit/src/rabbit_db_user.erl +++ b/deps/rabbit/src/rabbit_db_user.erl @@ -358,7 +358,7 @@ clear_matching_user_permissions_in_mnesia_tx(Username, VHostName) -> %% ------------------------------------------------------------------- -spec get_topic_permissions(Username, VHostName, ExchangeName) -> Ret when - Username :: internal_topic:topicname(), + Username :: rabbit_types:username(), VHostName :: vhost:name(), ExchangeName :: binary(), Ret :: TopicPermission | undefined, @@ -546,7 +546,7 @@ clear_topic_permissions_in_mnesia_tx(Username, VHostName, ExchangeName) -> -spec clear_matching_topic_permissions(Username, VHostName, ExchangeName) -> Ret when - Username :: internal_topic:topicname() | '_', + Username :: rabbit_types:username() | '_', VHostName :: vhost:name() | '_', ExchangeName :: binary() | '_', Ret :: [#topic_permission{}]. diff --git a/deps/rabbit/src/rabbit_definitions.erl b/deps/rabbit/src/rabbit_definitions.erl index ea26c49f3c18..07161b9e6883 100644 --- a/deps/rabbit/src/rabbit_definitions.erl +++ b/deps/rabbit/src/rabbit_definitions.erl @@ -467,13 +467,14 @@ apply_defs(Map, ActingUser, SuccessFun, VHost) when is_function(SuccessFun); is_ sequential_for_all(Category, ActingUser, Definitions, Fun) -> try - sequential_for_all0(Category, ActingUser, Definitions, Fun) + sequential_for_all0(Category, ActingUser, Definitions, Fun), + ok after rabbit_runtime:gc_all_processes() end. sequential_for_all0(Category, ActingUser, Definitions, Fun) -> - case maps:get(rabbit_data_coercion:to_atom(Category), Definitions, undefined) of + _ = case maps:get(rabbit_data_coercion:to_atom(Category), Definitions, undefined) of undefined -> ok; List -> case length(List) of @@ -484,20 +485,23 @@ sequential_for_all0(Category, ActingUser, Definitions, Fun) -> %% keys are expected to be atoms Fun(atomize_keys(M), ActingUser) end || M <- List, is_map(M)] - end. + end, + ok. sequential_for_all(Name, ActingUser, Definitions, VHost, Fun) -> try - sequential_for_all0(Name, ActingUser, Definitions, VHost, Fun) + sequential_for_all0(Name, ActingUser, Definitions, VHost, Fun), + ok after rabbit_runtime:gc_all_processes() end. sequential_for_all0(Name, ActingUser, Definitions, VHost, Fun) -> - case maps:get(rabbit_data_coercion:to_atom(Name), Definitions, undefined) of + _ = case maps:get(rabbit_data_coercion:to_atom(Name), Definitions, undefined) of undefined -> ok; - List -> [Fun(VHost, atomize_keys(M), ActingUser) || M <- List, is_map(M)] - end. + List -> _ = [Fun(VHost, atomize_keys(M), ActingUser) || M <- List, is_map(M)] + end, + ok. concurrent_for_all(Category, ActingUser, Definitions, Fun) -> try @@ -517,7 +521,8 @@ concurrent_for_all0(Category, ActingUser, Definitions, Fun) -> WorkPoolFun = fun(M) -> Fun(atomize_keys(M), ActingUser) end, - do_concurrent_for_all(List, WorkPoolFun) + do_concurrent_for_all(List, WorkPoolFun), + ok end. concurrent_for_all(Name, ActingUser, Definitions, VHost, Fun) -> @@ -545,7 +550,7 @@ do_concurrent_for_all(List, WorkPoolFun) -> worker_pool:submit_async( ?IMPORT_WORK_POOL, fun() -> - try + _ = try WorkPoolFun(M) catch {error, E} -> gatherer:in(Gatherer, {error, E}); _:E -> gatherer:in(Gatherer, {error, E}) diff --git a/deps/rabbit/src/rabbit_definitions_import_https.erl b/deps/rabbit/src/rabbit_definitions_import_https.erl index 84511aec054a..1c32358b4010 100644 --- a/deps/rabbit/src/rabbit_definitions_import_https.erl +++ b/deps/rabbit/src/rabbit_definitions_import_https.erl @@ -74,7 +74,7 @@ load_with_hashing(Proplist, PreviousHash, Algo) -> PreviousHash -> PreviousHash; Other -> rabbit_log:debug("New hash: ~ts", [rabbit_misc:hexify(Other)]), - import_raw(Body), + _ = import_raw(Body), Other end; {ok, {{_, Code, _}, _Headers, _Body}} when Code >= 400 -> @@ -106,7 +106,7 @@ load_from_url(URL, HTTPOptions0) -> end. httpc_get(URL, HTTPOptions0) -> - inets:start(), + _ = inets:start(), Options = [ {body_format, binary} ], diff --git a/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl b/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl index 997a3173447d..82f47a5f7bbc 100644 --- a/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl +++ b/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl @@ -96,7 +96,7 @@ load_with_hashing(IsDir, Path, PreviousHash, Algo) when is_boolean(IsDir) -> PreviousHash -> PreviousHash; Other -> rabbit_log:debug("New hash: ~ts", [rabbit_misc:hexify(Other)]), - load_from_local_path(IsDir, Path), + _ = load_from_local_path(IsDir, Path), Other end end. diff --git a/deps/rabbit/src/rabbit_direct.erl b/deps/rabbit/src/rabbit_direct.erl index 09c10e55bad3..d8d36c5b27ca 100644 --- a/deps/rabbit/src/rabbit_direct.erl +++ b/deps/rabbit/src/rabbit_direct.erl @@ -33,7 +33,7 @@ boot() -> rabbit_sup:start_supervisor_child( -spec force_event_refresh(reference()) -> 'ok'. force_event_refresh(Ref) -> - [Pid ! {force_event_refresh, Ref} || Pid <- list()], + _ = [Pid ! {force_event_refresh, Ref} || Pid <- list()], ok. -spec list_local() -> [pid()]. diff --git a/deps/rabbit/src/rabbit_disk_monitor.erl b/deps/rabbit/src/rabbit_disk_monitor.erl index 23de02189b04..54ae59741c13 100644 --- a/deps/rabbit/src/rabbit_disk_monitor.erl +++ b/deps/rabbit/src/rabbit_disk_monitor.erl @@ -136,9 +136,7 @@ init([Limit]) -> {unix, _} -> start_portprogram(); {win32, _OSname} -> - not_used; - _ -> - exit({unsupported_os, OS}) + not_used end, State3 = State2#state{port=Port, os=OS}, @@ -164,12 +162,12 @@ handle_call({set_max_check_interval, MaxInterval}, _From, State) -> {reply, ok, set_max_check_interval(MaxInterval, State)}; handle_call({set_enabled, _Enabled = true}, _From, State) -> - start_timer(set_disk_limits(State, State#state.limit)), + _ = start_timer(set_disk_limits(State, State#state.limit)), rabbit_log:info("Free disk space monitor was enabled"), {reply, ok, State#state{enabled = true}}; handle_call({set_enabled, _Enabled = false}, _From, State) -> - erlang:cancel_timer(State#state.timer), + _ = erlang:cancel_timer(State#state.timer), rabbit_log:info("Free disk space monitor was manually disabled"), {reply, ok, State#state{enabled = false}}; @@ -328,8 +326,6 @@ get_disk_free(Dir, {win32, _}, not_used) -> list_to_integer(FreeBytesAvailableToCallerStr) end. -parse_free_unix({error, Error}) -> - exit({unparseable, Error}); parse_free_unix(Str) -> case string:tokens(Str, "\n") of [_, S | _] -> case string:tokens(S, " \t") of diff --git a/deps/rabbit/src/rabbit_event_consumer.erl b/deps/rabbit/src/rabbit_event_consumer.erl index b591b5c3330e..523e3f86886d 100644 --- a/deps/rabbit/src/rabbit_event_consumer.erl +++ b/deps/rabbit/src/rabbit_event_consumer.erl @@ -31,7 +31,7 @@ register(Pid, Ref, Duration, Pattern) -> init([Pid, Ref, Duration, Pattern]) -> MRef = erlang:monitor(process, Pid), - case Duration of + _ = case Duration of infinity -> infinity; _ -> erlang:send_after(Duration * 1000, self(), rabbit_event_consumer_timeout) end, @@ -45,7 +45,7 @@ handle_event(#event{type = Type, reference = none}, #state{pid = Pid, ref = Ref, pattern = Pattern} = State) -> - case key(Type) of + _ = case key(Type) of ignore -> ok; Key -> case re:run(Key, Pattern, [{capture, none}]) of match -> diff --git a/deps/rabbit/src/rabbit_exchange.erl b/deps/rabbit/src/rabbit_exchange.erl index acd7483ce2bb..5d153a0b028e 100644 --- a/deps/rabbit/src/rabbit_exchange.erl +++ b/deps/rabbit/src/rabbit_exchange.erl @@ -288,7 +288,7 @@ lookup_scratch(Name, App) -> update_scratch(Name, App, Fun) -> rabbit_misc:execute_mnesia_transaction( fun() -> - update(Name, + _ = update(Name, fun(X = #exchange{scratches = Scratches0}) -> Scratches1 = case Scratches0 of undefined -> orddict:new(); @@ -311,7 +311,7 @@ update_decorators(Name) -> rabbit_misc:execute_mnesia_transaction( fun() -> case mnesia:wread({rabbit_exchange, Name}) of - [X] -> store_ram(X), + [X] -> _ = store_ram(X), ok; [] -> ok end @@ -491,7 +491,7 @@ delete(XName, IfUnused, Username) -> %% a race condition between it and an exchange.delete. %% %% see rabbitmq/rabbitmq-federation#7 - rabbit_runtime_parameters:set(XName#resource.virtual_host, + _ = rabbit_runtime_parameters:set(XName#resource.virtual_host, ?EXCHANGE_DELETE_IN_PROGRESS_COMPONENT, XName#resource.name, true, Username), call_with_exchange( diff --git a/deps/rabbit/src/rabbit_exchange_decorator.erl b/deps/rabbit/src/rabbit_exchange_decorator.erl index 41867ef91c10..c1035539d8ee 100644 --- a/deps/rabbit/src/rabbit_exchange_decorator.erl +++ b/deps/rabbit/src/rabbit_exchange_decorator.erl @@ -100,6 +100,6 @@ maybe_recover(X = #exchange{name = Name, case New of Old -> ok; _ -> %% TODO create a tx here for non-federation decorators - [M:create(none, X) || M <- New -- Old], + _ = [M:create(none, X) || M <- New -- Old], rabbit_exchange:update_decorators(Name) end. diff --git a/deps/rabbit/src/rabbit_exchange_parameters.erl b/deps/rabbit/src/rabbit_exchange_parameters.erl index f17af57719a9..64d22070bb0f 100644 --- a/deps/rabbit/src/rabbit_exchange_parameters.erl +++ b/deps/rabbit/src/rabbit_exchange_parameters.erl @@ -24,7 +24,7 @@ register() -> rabbit_registry:register(runtime_parameter, ?EXCHANGE_DELETE_IN_PROGRESS_COMPONENT, ?MODULE), %% ensure there are no leftovers from before node restart/crash - rabbit_runtime_parameters:clear_component( + _ = rabbit_runtime_parameters:clear_component( ?EXCHANGE_DELETE_IN_PROGRESS_COMPONENT, ?INTERNAL_USER), ok. diff --git a/deps/rabbit/src/rabbit_exchange_type_topic.erl b/deps/rabbit/src/rabbit_exchange_type_topic.erl index f485685307c6..041185562153 100644 --- a/deps/rabbit/src/rabbit_exchange_type_topic.erl +++ b/deps/rabbit/src/rabbit_exchange_type_topic.erl @@ -64,7 +64,7 @@ add_binding(none, _Exchange, _Binding) -> remove_bindings(transaction, _X, Bs) -> %% See rabbit_binding:lock_route_tables for the rationale for %% taking table locks. - case Bs of + _ = case Bs of [_] -> ok; _ -> [mnesia:lock({table, T}, write) || T <- [rabbit_topic_trie_node, diff --git a/deps/rabbit/src/rabbit_ff_registry.erl b/deps/rabbit/src/rabbit_ff_registry.erl index eaea416729f7..6d6d319f08ef 100644 --- a/deps/rabbit/src/rabbit_ff_registry.erl +++ b/deps/rabbit/src/rabbit_ff_registry.erl @@ -74,7 +74,7 @@ %% @returns the properties of the specified feature flag. get(FeatureName) -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), ?convince_dialyzer(?MODULE:get(FeatureName), undefined, #{}). -spec list(all | enabled | disabled) -> rabbit_feature_flags:feature_flags(). @@ -89,7 +89,7 @@ get(FeatureName) -> %% @returns A map of selected feature flags. list(Which) -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), ?convince_dialyzer(?MODULE:list(Which), #{}, #{}). -spec states() -> rabbit_feature_flags:feature_states(). @@ -102,7 +102,7 @@ list(Which) -> %% @returns A map of feature flag states. states() -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), ?convince_dialyzer(?MODULE:states(), #{}, #{}). -spec is_supported(rabbit_feature_flags:feature_name()) -> boolean(). @@ -117,7 +117,7 @@ states() -> %% otherwise. is_supported(FeatureName) -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), ?convince_dialyzer(?MODULE:is_supported(FeatureName), false, true). -spec is_enabled(rabbit_feature_flags:feature_name()) -> boolean() | state_changing. @@ -132,7 +132,7 @@ is_supported(FeatureName) -> %% its state is transient, or `false' otherwise. is_enabled(FeatureName) -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), ?convince_dialyzer(?MODULE:is_enabled(FeatureName), false, true). -spec is_registry_initialized() -> boolean(). @@ -169,7 +169,7 @@ is_registry_written_to_disk() -> -spec inventory() -> rabbit_feature_flags:inventory(). inventory() -> - rabbit_ff_registry_factory:initialize_registry(), + _ = rabbit_ff_registry_factory:initialize_registry(), Inventory = #{applications => [], feature_flags => #{}, states => #{}}, diff --git a/deps/rabbit/src/rabbit_fifo_client.erl b/deps/rabbit/src/rabbit_fifo_client.erl index b1b939d36ec2..bec5a2bacefe 100644 --- a/deps/rabbit/src/rabbit_fifo_client.erl +++ b/deps/rabbit/src/rabbit_fifo_client.erl @@ -919,7 +919,7 @@ set_timer(#state{leader = Leader0, cancel_timer(#state{timer_state = undefined} = State) -> State; cancel_timer(#state{timer_state = Ref} = State) -> - erlang:cancel_timer(Ref, [{async, true}, {info, false}]), + _ = erlang:cancel_timer(Ref, [{async, true}, {info, false}]), State#state{timer_state = undefined}. find_local_or_leader(#state{leader = Leader, diff --git a/deps/rabbit/src/rabbit_fifo_dlx_worker.erl b/deps/rabbit/src/rabbit_fifo_dlx_worker.erl index e3dfa08dc8fd..8322de87bb80 100644 --- a/deps/rabbit/src/rabbit_fifo_dlx_worker.erl +++ b/deps/rabbit/src/rabbit_fifo_dlx_worker.erl @@ -533,14 +533,14 @@ maybe_cancel_timer(#state{timer = TRef, pendings = Pendings} = State) when is_reference(TRef), map_size(Pendings) =:= 0 -> - erlang:cancel_timer(TRef, [{async, true}, {info, false}]), + _ = erlang:cancel_timer(TRef, [{async, true}, {info, false}]), State#state{timer = undefined}; maybe_cancel_timer(State) -> State. cancel_timer(#state{timer = TRef} = State) when is_reference(TRef) -> - erlang:cancel_timer(TRef, [{async, true}, {info, false}]), + _ = erlang:cancel_timer(TRef, [{async, true}, {info, false}]), State#state{timer = undefined}; cancel_timer(State) -> State. diff --git a/deps/rabbit/src/rabbit_limiter.erl b/deps/rabbit/src/rabbit_limiter.erl index d9e0c90d490e..dfba86b3127d 100644 --- a/deps/rabbit/src/rabbit_limiter.erl +++ b/deps/rabbit/src/rabbit_limiter.erl @@ -441,7 +441,7 @@ notify_queues(State = #lim{ch_pid = ChPid, queues = Queues}) -> %% thus ensuring that each queue has an equal chance of %% being notified first. {L1, L2} = lists:split(rand:uniform(L), QList), - [[ok = rabbit_amqqueue:resume(Q, ChPid) || Q <- L3] + _ = [[ok = rabbit_amqqueue:resume(Q, ChPid) || Q <- L3] || L3 <- [L2, L1]], ok end, diff --git a/deps/rabbit/src/rabbit_log_tail.erl b/deps/rabbit/src/rabbit_log_tail.erl index 0265617285a8..fd724acbade5 100644 --- a/deps/rabbit/src/rabbit_log_tail.erl +++ b/deps/rabbit/src/rabbit_log_tail.erl @@ -59,7 +59,7 @@ tail_n_lines(Filename, N) -> {ok, Eof} = file:position(File, eof), %% Eof may move. Only read up to the current one. Result = reverse_read_n_lines(N, N, File, Eof, Eof), - file:close(File), + _ = file:close(File), Result; {error, _} = Error -> Error end. diff --git a/deps/rabbit/src/rabbit_logger_exchange_h.erl b/deps/rabbit/src/rabbit_logger_exchange_h.erl index ebbb4d98b044..1f8dd125ad35 100644 --- a/deps/rabbit/src/rabbit_logger_exchange_h.erl +++ b/deps/rabbit/src/rabbit_logger_exchange_h.erl @@ -174,7 +174,7 @@ unconfigure_exchange( virtual_host = VHost} = Exchange, setup_proc := Pid}}) -> Pid ! stop, - rabbit_exchange:delete(Exchange, false, ?INTERNAL_USER), + _ = rabbit_exchange:delete(Exchange, false, ?INTERNAL_USER), ?LOG_INFO( "Logging to exchange '~ts' in vhost '~ts' disabled", [Name, VHost], diff --git a/deps/rabbit/src/rabbit_maintenance.erl b/deps/rabbit/src/rabbit_maintenance.erl index d81321d0cd70..d3af0bfdef18 100644 --- a/deps/rabbit/src/rabbit_maintenance.erl +++ b/deps/rabbit/src/rabbit_maintenance.erl @@ -92,7 +92,7 @@ drain() -> rabbit_log:warning("This node is being put into maintenance (drain) mode"), mark_as_being_drained(), rabbit_log:info("Marked this node as undergoing maintenance"), - suspend_all_client_listeners(), + _ = suspend_all_client_listeners(), rabbit_log:warning("Suspended all listeners and will no longer accept client connections"), {ok, NConnections} = close_all_client_connections(), rabbit_log:warning("Closed ~b local client connections", [NConnections]), @@ -125,7 +125,7 @@ revive() -> rabbit_log:info("This node is being revived from maintenance (drain) mode"), revive_local_quorum_queue_replicas(), rabbit_log:info("Resumed all listeners and will accept client connections again"), - resume_all_client_listeners(), + _ = resume_all_client_listeners(), rabbit_log:info("Resumed all listeners and will accept client connections again"), unmark_as_being_drained(), rabbit_log:info("Marked this node as back from maintenance and ready to serve clients"), diff --git a/deps/rabbit/src/rabbit_memory_monitor.erl b/deps/rabbit/src/rabbit_memory_monitor.erl index 683b07ea543a..73f86a79f920 100644 --- a/deps/rabbit/src/rabbit_memory_monitor.erl +++ b/deps/rabbit/src/rabbit_memory_monitor.erl @@ -163,7 +163,7 @@ handle_info(_Info, State) -> {noreply, State}. terminate(_Reason, #state { timer = TRef }) -> - timer:cancel(TRef), + _ = timer:cancel(TRef), ok. code_change(_OldVsn, State, _Extra) -> diff --git a/deps/rabbit/src/rabbit_mirror_queue_misc.erl b/deps/rabbit/src/rabbit_mirror_queue_misc.erl index 0105fb7ab3b3..9978264241ee 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_misc.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_misc.erl @@ -108,7 +108,7 @@ remove_from_queue(QueueName, Self, DeadGMPids) -> Q1 = amqqueue:set_pid(Q0, QPid1), Q2 = amqqueue:set_slave_pids(Q1, SPids1), Q3 = amqqueue:set_gm_pids(Q2, AliveGM), - store_updated_slaves(Q3), + _ = store_updated_slaves(Q3), %% If we add and remove nodes at the %% same time we might tell the old %% master we need to sync and then @@ -121,7 +121,7 @@ remove_from_queue(QueueName, Self, DeadGMPids) -> %% [1]. Q1 = amqqueue:set_slave_pids(Q0, Alive), Q2 = amqqueue:set_gm_pids(Q1, AliveGM), - store_updated_slaves(Q2), + _ = store_updated_slaves(Q2), {ok, QPid1, DeadPids, []} end end @@ -192,11 +192,11 @@ on_vhost_up(VHost) -> QNames0 end, [], rabbit_queue) end), - [add_mirror(QName, node(), async) || QName <- QNames], + _ = [add_mirror(QName, node(), async) || QName <- QNames], ok. drop_mirrors(QName, Nodes) -> - [drop_mirror(QName, Node) || Node <- Nodes], + _ = [drop_mirror(QName, Node) || Node <- Nodes], ok. drop_mirror(QName, MirrorNode) -> @@ -225,7 +225,7 @@ drop_mirror(QName, MirrorNode) -> 'ok'. add_mirrors(QName, Nodes, SyncMode) -> - [add_mirror(QName, Node, SyncMode) || Node <- Nodes], + _ = [add_mirror(QName, Node, SyncMode) || Node <- Nodes], ok. add_mirror(QName, MirrorNode, SyncMode) -> @@ -704,7 +704,8 @@ maybe_drop_master_after_sync(Q) when ?is_amqqueue(Q) -> case node(MPid) of DesiredMNode -> ok; OldMNode -> false = lists:member(OldMNode, DesiredSNodes), %% [0] - drop_mirror(QName, OldMNode) + _ = drop_mirror(QName, OldMNode), + ok end, ok. %% [0] ASSERTION - if the policy wants the master to change, it has diff --git a/deps/rabbit/src/rabbit_mirror_queue_slave.erl b/deps/rabbit/src/rabbit_mirror_queue_slave.erl index d95870d0c3dd..2b9dfc96d0d7 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_slave.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_slave.erl @@ -176,8 +176,8 @@ init_it(Self, GM, Node, QName) -> GMPids = amqqueue:get_gm_pids(Q), PSPids = amqqueue:get_slave_pids_pending_shutdown(Q), case [Pid || Pid <- [QPid | SPids], node(Pid) =:= Node] of - [] -> stop_pending_slaves(QName, PSPids), - add_slave(Q, Self, GM), + [] -> _ = stop_pending_slaves(QName, PSPids), + _ = add_slave(Q, Self, GM), {new, QPid, GMPids}; [QPid] -> case rabbit_mnesia:is_process_alive(QPid) of true -> duplicate_live_master; @@ -189,7 +189,7 @@ init_it(Self, GM, Node, QName) -> SPids1 = SPids -- [SPid], Q1 = amqqueue:set_slave_pids(Q, SPids1), Q2 = amqqueue:set_gm_pids(Q1, GMPids1), - add_slave(Q2, Self, GM), + _ = add_slave(Q2, Self, GM), {new, QPid, GMPids1} end end; @@ -442,7 +442,8 @@ terminate_shutdown(Reason, State = #state{backing_queue = BQ, terminate_common(State) -> ok = rabbit_memory_monitor:deregister(self()), - stop_rate_timer(stop_sync_timer(State)). + _ = stop_rate_timer(stop_sync_timer(State)), + ok. code_change(_OldVsn, State, _Extra) -> {ok, State}. @@ -1083,7 +1084,7 @@ record_synchronised(Q0) when ?is_amqqueue(Q0) -> SSPids = amqqueue:get_sync_slave_pids(Q1), SSPids1 = [Self | SSPids], Q2 = amqqueue:set_sync_slave_pids(Q1, SSPids1), - rabbit_mirror_queue_misc:store_updated_slaves(Q2), + _ = rabbit_mirror_queue_misc:store_updated_slaves(Q2), {ok, Q2} end end, diff --git a/deps/rabbit/src/rabbit_mirror_queue_sync.erl b/deps/rabbit/src/rabbit_mirror_queue_sync.erl index 41e4480194d2..f99d8a2fe0da 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_sync.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_sync.erl @@ -256,7 +256,7 @@ await_slaves(Ref, SPids) -> %% down. syncer_check_resources(Ref, MPid, SPids) -> - rabbit_alarm:register(self(), {?MODULE, conserve_resources, []}), + _ = rabbit_alarm:register(self(), {?MODULE, conserve_resources, []}), %% Before we ask the master node to send the first batch of messages %% over here, we check if one node is already short on memory. If %% that's the case, we wait for the alarm to be cleared before @@ -295,7 +295,7 @@ syncer_loop(Ref, MPid, SPids) -> % Die silently because there are no mirrors left. ok; _ -> - broadcast(SPids1, {sync_msgs, Ref, Msgs}), + _ = broadcast(SPids1, {sync_msgs, Ref, Msgs}), MPid ! {next, Ref}, syncer_loop(Ref, MPid, SPids1) end; diff --git a/deps/rabbit/src/rabbit_mnesia.erl b/deps/rabbit/src/rabbit_mnesia.erl index f90d8f09edaa..4b9c35fc07c2 100644 --- a/deps/rabbit/src/rabbit_mnesia.erl +++ b/deps/rabbit/src/rabbit_mnesia.erl @@ -330,7 +330,7 @@ update_cluster_nodes(DiscoveryNode) -> %% As in `check_consistency/0', we can safely delete the %% schema here, since it'll be replicated from the other %% nodes - mnesia:delete_schema([node()]), + _ = mnesia:delete_schema([node()]), rabbit_node_monitor:write_cluster_status(Status), rabbit_log:info("Updating cluster nodes from ~tp", [DiscoveryNode]), @@ -564,12 +564,12 @@ init_db(ClusterNodes, NodeType, CheckOtherNodes) -> ok; {[], true, disc} -> %% First disc node up - maybe_force_load(), + _ = maybe_force_load(), ensure_feature_flags_are_in_sync(Nodes, NodeIsVirgin), ok; {[_ | _], _, _} -> %% Subsequent node in cluster, catch up - maybe_force_load(), + _ = maybe_force_load(), %% We want to synchronize feature flags first before we wait for %% tables (which is needed to ensure the local view of the tables %% matches the rest of the cluster). The reason is that some @@ -717,7 +717,8 @@ check_cluster_consistency() -> %% disbanded, we're left with a node with no %% mnesia data that will try to connect to offline %% nodes. - mnesia:delete_schema([node()]) + _ = mnesia:delete_schema([node()]), + ok end, rabbit_node_monitor:write_cluster_status(Status); {error, not_found} -> @@ -959,9 +960,9 @@ with_running_or_clean_mnesia(Fun) -> application:unset_env(mnesia, dir), SchemaLoc = application:get_env(mnesia, schema_location, opt_disc), application:set_env(mnesia, schema_location, ram), - mnesia:start(), + _ = mnesia:start(), Result = Fun(), - application:stop(mnesia), + _ = application:stop(mnesia), application:set_env(mnesia, dir, SavedMnesiaDir), application:set_env(mnesia, schema_location, SchemaLoc), Result diff --git a/deps/rabbit/src/rabbit_mnesia_rename.erl b/deps/rabbit/src/rabbit_mnesia_rename.erl index 0224a5ffd495..7e4c12d18bd2 100644 --- a/deps/rabbit/src/rabbit_mnesia_rename.erl +++ b/deps/rabbit/src/rabbit_mnesia_rename.erl @@ -60,10 +60,10 @@ rename(Node, NodeMapList) -> %% And make the actual changes become(FromNode), take_backup(before_backup_name()), - convert_backup(NodeMap, before_backup_name(), after_backup_name()), + _ = convert_backup(NodeMap, before_backup_name(), after_backup_name()), ok = rabbit_file:write_term_file(rename_config_name(), [{FromNode, ToNode}]), - convert_config_files(NodeMap), + _ = convert_config_files(NodeMap), become(ToNode), restore_backup(after_backup_name()), ok @@ -152,7 +152,7 @@ finish(FromNode, ToNode, AllNodes) -> rabbit_log:info( "Abandoning rename from ~ts to ~ts since we are still ~ts", [FromNode, ToNode, FromNode]), - [{ok, _} = file:copy(backup_of_conf(F), F) || F <- config_files()], + _ = [{ok, _} = file:copy(backup_of_conf(F), F) || F <- config_files()], ok = rabbit_file:recursive_delete([rabbit_mnesia:dir()]), ok = rabbit_file:recursive_copy( mnesia_copy_dir(), rabbit_mnesia:dir()), @@ -272,7 +272,7 @@ rename_in_running_mnesia(FromNode, ToNode) -> transform_table(Table, Map) -> mnesia:sync_transaction( fun () -> - mnesia:lock({table, Table}, write), + _ = mnesia:lock({table, Table}, write), transform_table(Table, Map, mnesia:first(Table)) end). diff --git a/deps/rabbit/src/rabbit_msg_store.erl b/deps/rabbit/src/rabbit_msg_store.erl index ac3056f8a6cb..9c85120f1ba0 100644 --- a/deps/rabbit/src/rabbit_msg_store.erl +++ b/deps/rabbit/src/rabbit_msg_store.erl @@ -478,13 +478,13 @@ client_init(Server, Ref, MsgOnDiskFun, CloseFDsFun) when is_pid(Server); is_atom -spec client_terminate(client_msstate()) -> 'ok'. client_terminate(CState = #client_msstate { client_ref = Ref }) -> - close_all_handles(CState), + _ = close_all_handles(CState), ok = server_call(CState, {client_terminate, Ref}). -spec client_delete_and_terminate(client_msstate()) -> 'ok'. client_delete_and_terminate(CState = #client_msstate { client_ref = Ref }) -> - close_all_handles(CState), + _ = close_all_handles(CState), ok = server_cast(CState, {client_dying, Ref}), ok = server_cast(CState, {client_delete, Ref}). @@ -2196,14 +2196,14 @@ copy_messages(WorkList, InitOffset, FinalOffset, SourceHdl, DestinationHdl, _ -> %% found a gap, so actually do the work for %% the previous block - Copy(Block), + _ = Copy(Block), {Offset, Offset + TotalSize} end} end, {InitOffset, {undefined, undefined}}, WorkList) of {FinalOffset, Block} -> case WorkList of [] -> ok; - _ -> Copy(Block), %% do the last remaining block + _ -> _ = Copy(Block), %% do the last remaining block ok = file_handle_cache:sync(DestinationHdl) end; {FinalOffsetZ, _Block} -> diff --git a/deps/rabbit/src/rabbit_msg_store_ets_index.erl b/deps/rabbit/src/rabbit_msg_store_ets_index.erl index e19e66f1dc7d..26888133ec7e 100644 --- a/deps/rabbit/src/rabbit_msg_store_ets_index.erl +++ b/deps/rabbit/src/rabbit_msg_store_ets_index.erl @@ -24,14 +24,14 @@ dir :: binary()}). new(Dir) -> - file:delete(filename:join(Dir, ?FILENAME)), + _ = file:delete(filename:join(Dir, ?FILENAME)), Tid = ets:new(?MSG_LOC_NAME, [set, public, {keypos, #msg_location.msg_id}]), #state { table = Tid, dir = rabbit_file:filename_to_binary(Dir) }. recover(Dir) -> Path = filename:join(Dir, ?FILENAME), case ets:file2tab(Path) of - {ok, Tid} -> file:delete(Path), + {ok, Tid} -> _ = file:delete(Path), {ok, #state { table = Tid, dir = rabbit_file:filename_to_binary(Dir) }}; Error -> Error end. diff --git a/deps/rabbit/src/rabbit_networking.erl b/deps/rabbit/src/rabbit_networking.erl index b7d2bb4b34a3..9b9ee8213edf 100644 --- a/deps/rabbit/src/rabbit_networking.erl +++ b/deps/rabbit/src/rabbit_networking.erl @@ -128,8 +128,9 @@ boot_tls(NumAcceptors, ConcurrentConnsSupsCount) -> {ok, SslListeners} -> SslOpts = ensure_ssl(), case poodle_check('AMQP') of - ok -> [start_ssl_listener(L, SslOpts, NumAcceptors, ConcurrentConnsSupsCount) - || L <- SslListeners]; + ok -> _ = [start_ssl_listener(L, SslOpts, NumAcceptors, ConcurrentConnsSupsCount) + || L <- SslListeners], + ok; danger -> ok end, ok diff --git a/deps/rabbit/src/rabbit_node_monitor.erl b/deps/rabbit/src/rabbit_node_monitor.erl index 8748aaa45dd3..8a83dc97d7fd 100644 --- a/deps/rabbit/src/rabbit_node_monitor.erl +++ b/deps/rabbit/src/rabbit_node_monitor.erl @@ -379,7 +379,7 @@ init([]) -> %% writing out the cluster status files - bad things can then %% happen. process_flag(trap_exit, true), - net_kernel:monitor_nodes(true, [nodedown_reason]), + _ = net_kernel:monitor_nodes(true, [nodedown_reason]), {ok, _} = mnesia:subscribe(system), %% If the node has been restarted, Mnesia can trigger a system notification %% before the monitor subscribes to receive them. To avoid autoheal blocking due to @@ -483,7 +483,8 @@ handle_cast({check_partial_partition, Node, Rep, NodeGUID, MyGUID, RepGUID}, rabbit_log:warning("Node ~tp was restarted", [Node]), ok end - end); + end), + ok; false -> ok end, {noreply, State}; @@ -600,7 +601,7 @@ handle_info({'DOWN', _MRef, process, {rabbit, Node}, _Reason}, rabbit_log:info("rabbit on node ~tp down", [Node]), {AllNodes, DiscNodes, RunningNodes} = read_cluster_status(), write_cluster_status({AllNodes, DiscNodes, del_node(Node, RunningNodes)}), - [P ! {node_down, Node} || P <- pmon:monitored(Subscribers)], + _ = [P ! {node_down, Node} || P <- pmon:monitored(Subscribers)], {noreply, handle_dead_rabbit( Node, State#state{monitors = pmon:erase({rabbit, Node}, Monitors)})}; @@ -617,7 +618,7 @@ handle_info({nodedown, Node, Info}, State = #state{guid = MyGUID, cast(N, {check_partial_partition, Node, node(), DownGUID, CheckGUID, MyGUID}) end, - case maps:find(Node, GUIDs) of + _ = case maps:find(Node, GUIDs) of {ok, DownGUID} -> Alive = rabbit_nodes:all_running() -- [node(), Node], [case maps:find(N, GUIDs) of @@ -688,7 +689,7 @@ handle_info(_Info, State) -> {noreply, State}. terminate(_Reason, State) -> - rabbit_misc:stop_timer(State, #state.down_ping_timer), + _ = rabbit_misc:stop_timer(State, #state.down_ping_timer), ok. code_change(_OldVsn, State, _Extra) -> diff --git a/deps/rabbit/src/rabbit_nodes.erl b/deps/rabbit/src/rabbit_nodes.erl index f308f6b8fa19..58b1c0647ac2 100644 --- a/deps/rabbit/src/rabbit_nodes.erl +++ b/deps/rabbit/src/rabbit_nodes.erl @@ -40,7 +40,7 @@ %%---------------------------------------------------------------------------- boot() -> - seed_internal_cluster_id(), + _ = seed_internal_cluster_id(), seed_user_provided_cluster_name(). name_type() -> @@ -99,7 +99,7 @@ cluster_name_default() -> persistent_cluster_id() -> case rabbit_runtime_parameters:lookup_global(?INTERNAL_CLUSTER_ID_PARAM_NAME) of not_found -> - seed_internal_cluster_id(), + _ = seed_internal_cluster_id(), persistent_cluster_id(); Param -> #{value := Val, name := ?INTERNAL_CLUSTER_ID_PARAM_NAME} = maps:from_list(Param), diff --git a/deps/rabbit/src/rabbit_observer_cli_classic_queues.erl b/deps/rabbit/src/rabbit_observer_cli_classic_queues.erl index 7e1704eb131f..b4aa34778f7d 100644 --- a/deps/rabbit/src/rabbit_observer_cli_classic_queues.erl +++ b/deps/rabbit/src/rabbit_observer_cli_classic_queues.erl @@ -55,7 +55,7 @@ sheet_body(State) -> Body = [begin #resource{name = Name, virtual_host = Vhost} = amqqueue:get_name(Q), case rabbit_amqqueue:pid_of(Q) of - {error, not_found} -> + none -> ["dead", Vhost, unicode:characters_to_binary([Name, " (dead)"]), 0,0,0,0,0,0,0,0,0,0]; Pid -> diff --git a/deps/rabbit/src/rabbit_osiris_metrics.erl b/deps/rabbit/src/rabbit_osiris_metrics.erl index c877bd30d8ea..928da30bcb0f 100644 --- a/deps/rabbit/src/rabbit_osiris_metrics.erl +++ b/deps/rabbit/src/rabbit_osiris_metrics.erl @@ -55,7 +55,7 @@ handle_cast(_Request, State) -> handle_info(tick, #state{timeout = Timeout} = State) -> Data = osiris_counters:overview(), - maps:map( + _ = maps:map( fun ({osiris_writer, QName}, #{offset := Offs, first_offset := FstOffs}) -> COffs = Offs + 1 - FstOffs, diff --git a/deps/rabbit/src/rabbit_peer_discovery.erl b/deps/rabbit/src/rabbit_peer_discovery.erl index 9e1da6b08592..82645a7c74f8 100644 --- a/deps/rabbit/src/rabbit_peer_discovery.erl +++ b/deps/rabbit/src/rabbit_peer_discovery.erl @@ -84,7 +84,7 @@ log_configured_backend() -> maybe_init() -> Backend = backend(), - code:ensure_loaded(Backend), + _ = code:ensure_loaded(Backend), case erlang:function_exported(Backend, init, 0) of true -> rabbit_log:debug("Peer discovery backend supports initialisation"), diff --git a/deps/rabbit/src/rabbit_plugins.erl b/deps/rabbit/src/rabbit_plugins.erl index 7911f1214cb3..5ebd968e8cbb 100644 --- a/deps/rabbit/src/rabbit_plugins.erl +++ b/deps/rabbit/src/rabbit_plugins.erl @@ -51,7 +51,7 @@ ensure1(FileJustChanged0) -> %% The app_utils module stops the apps in reverse order, so we should %% pass them here in dependency order. rabbit:stop_apps(lists:reverse(Stop)), - clean_plugins(Stop), + _ = clean_plugins(Stop), case {Start, Stop} of {[], []} -> ok; @@ -240,7 +240,7 @@ ensure_dependencies(Plugins) -> is_loadable(App) -> case application:load(App) of {error, {already_loaded, _}} -> true; - ok -> application:unload(App), + ok -> _ = application:unload(App), true; _ -> false end. @@ -311,7 +311,7 @@ format_required_versions(Versions) -> end, Versions). validate_plugins(Plugins) -> - application:load(rabbit), + _ = application:load(rabbit), RabbitVersion = RabbitVersion = case application:get_key(rabbit, vsn) of undefined -> "0.0.0"; {ok, Val} -> Val @@ -407,7 +407,7 @@ clean_plugins(Plugins) -> clean_plugin(Plugin, ExpandDir) -> {ok, Mods} = application:get_key(Plugin, modules), - application:unload(Plugin), + _ = application:unload(Plugin), [begin code:soft_purge(Mod), code:delete(Mod), @@ -418,7 +418,7 @@ clean_plugin(Plugin, ExpandDir) -> prepare_dir_plugin(PluginAppDescPath) -> PluginEbinDir = filename:dirname(PluginAppDescPath), Plugin = filename:basename(PluginAppDescPath, ".app"), - code:add_patha(PluginEbinDir), + _ = code:add_patha(PluginEbinDir), case filelib:wildcard(PluginEbinDir++ "/*.beam") of [] -> ok; @@ -630,7 +630,7 @@ list_all_deps(Applications) -> list_all_deps([Application | Applications], Deps) -> %% We load the application to be sure we can get the "applications" key. %% This is required for rabbitmq-plugins for instance. - application:load(Application), + _ = application:load(Application), NewDeps = [Application | Deps], case application:get_key(Application, applications) of {ok, ApplicationDeps} -> diff --git a/deps/rabbit/src/rabbit_policy.erl b/deps/rabbit/src/rabbit_policy.erl index 7360ed4b54e8..c20eaec34cd8 100644 --- a/deps/rabbit/src/rabbit_policy.erl +++ b/deps/rabbit/src/rabbit_policy.erl @@ -269,7 +269,7 @@ recover0() -> end), Policies = list(), OpPolicies = list_op(), - [rabbit_misc:execute_mnesia_transaction( + _ = [rabbit_misc:execute_mnesia_transaction( fun () -> mnesia:write( rabbit_durable_exchange, @@ -278,7 +278,7 @@ recover0() -> operator_policy = match(Name, OpPolicies)}), write) end) || X = #exchange{name = Name} <- Xs], - [begin + _ = [begin QName = amqqueue:get_name(Q0), Policy1 = match(QName, Policies), Q1 = amqqueue:set_policy(Q0, Policy1), @@ -445,7 +445,7 @@ update_matched_objects(VHost, PolicyDef, ActingUser) -> rabbit_exchange, rabbit_durable_exchange], {XUpdateResults, QUpdateResults} = rabbit_misc:execute_mnesia_transaction( fun() -> - [mnesia:lock({table, T}, write) || T <- Tabs], %% [1] + _ = [mnesia:lock({table, T}, write) || T <- Tabs], %% [1] case catch {list(VHost), list_op(VHost)} of {'EXIT', {throw, {error, {no_such_vhost, _}}}} -> {[], []}; %% [2] @@ -458,8 +458,8 @@ update_matched_objects(VHost, PolicyDef, ActingUser) -> Q <- rabbit_amqqueue:list(VHost)]} end end), - [catch maybe_notify_of_policy_change(XRes, PolicyDef, ActingUser) || XRes <- XUpdateResults], - [catch maybe_notify_of_policy_change(QRes, PolicyDef, ActingUser) || QRes <- QUpdateResults], + _ = [catch maybe_notify_of_policy_change(XRes, PolicyDef, ActingUser) || XRes <- XUpdateResults], + _ = [catch maybe_notify_of_policy_change(QRes, PolicyDef, ActingUser) || QRes <- QUpdateResults], ok. update_exchange(X = #exchange{name = XName, diff --git a/deps/rabbit/src/rabbit_prelaunch_logging.erl b/deps/rabbit/src/rabbit_prelaunch_logging.erl index a30bb6d39291..0132c549584a 100644 --- a/deps/rabbit/src/rabbit_prelaunch_logging.erl +++ b/deps/rabbit/src/rabbit_prelaunch_logging.erl @@ -263,7 +263,7 @@ set_log_level(Level) -> ?LOG_DEBUG( "Logging: changing primary log level to ~ts", [Level], #{domain => ?RMQLOG_DOMAIN_GLOBAL}), - logger:set_primary_config(level, Level), + _ = logger:set_primary_config(level, Level), %% Per-module log level. lists:foreach( @@ -318,9 +318,9 @@ set_log_level(Level) -> %% If the log level is set to `debug', we turn off burst limit to %% make sure all debug messages make it. Config1 = adjust_burst_limit(Config, Level), - logger:set_handler_config(Id, filters, Filters1), - logger:set_handler_config(Id, config, Config1), - logger:set_handler_config(Id, level, Level), + _ = logger:set_handler_config(Id, filters, Filters1), + _ = logger:set_handler_config(Id, config, Config1), + _ = logger:set_handler_config(Id, level, Level), ok; (#{id := Id, config := Config}) -> ?LOG_DEBUG( @@ -330,8 +330,8 @@ set_log_level(Level) -> %% If the log level is set to `debug', we turn off burst limit to %% make sure all debug messages make it. Config1 = adjust_burst_limit(Config, Level), - logger:set_handler_config(Id, config, Config1), - logger:set_handler_config(Id, level, Level), + _ = logger:set_handler_config(Id, config, Config1), + _ = logger:set_handler_config(Id, level, Level), ok end, logger:get_handler_config()), ok. diff --git a/deps/rabbit/src/rabbit_queue_consumers.erl b/deps/rabbit/src/rabbit_queue_consumers.erl index 19c5341b80ed..d98c26a4d93d 100644 --- a/deps/rabbit/src/rabbit_queue_consumers.erl +++ b/deps/rabbit/src/rabbit_queue_consumers.erl @@ -120,7 +120,7 @@ count() -> lists:sum([Count || #cr{consumer_count = Count} <- all_ch_record()]). unacknowledged_message_count() -> lists:sum([?QUEUE:len(C#cr.acktags) || C <- all_ch_record()]). --spec add(amqqueue:name(), ch(), rabbit_types:ctag(), boolean(), pid(), boolean(), +-spec add(rabbit_amqqueue:name(), ch(), rabbit_types:ctag(), boolean(), pid(), boolean(), non_neg_integer(), rabbit_framing:amqp_table(), boolean(), rabbit_types:username(), state()) -> state(). @@ -192,7 +192,7 @@ erase_ch(ChPid, State = #state{consumers = Consumers}) -> State#state{consumers = remove_consumers(ChPid, Consumers)}} end. --spec send_drained(amqqueue:name()) -> 'ok'. +-spec send_drained(rabbit_amqqueue:name()) -> 'ok'. send_drained(QName) -> [update_ch_record(send_drained(QName, C)) || C <- all_ch_record()], ok. @@ -395,7 +395,7 @@ deactivate_limit_fun() -> C#cr{limiter = rabbit_limiter:deactivate(Limiter)} end. --spec credit(amqqueue:name(), boolean(), integer(), boolean(), ch(), +-spec credit(rabbit_amqqueue:name(), boolean(), integer(), boolean(), ch(), rabbit_types:ctag(), state()) -> 'unchanged' | {'unblocked', state()}. @@ -505,7 +505,7 @@ update_ch_record(C = #cr{consumer_count = ConsumerCount, {true, 0, 0} -> ok = erase_ch_record(C); _ -> ok = store_ch_record(C) end, - C. + ok. store_ch_record(C = #cr{ch_pid = ChPid}) -> put({ch, ChPid}, C), diff --git a/deps/rabbit/src/rabbit_queue_decorator.erl b/deps/rabbit/src/rabbit_queue_decorator.erl index 4073f5a1be9a..c7fe6fe78960 100644 --- a/deps/rabbit/src/rabbit_queue_decorator.erl +++ b/deps/rabbit/src/rabbit_queue_decorator.erl @@ -67,6 +67,6 @@ maybe_recover(Q0) when ?is_amqqueue(Q0) -> ok; _ -> %% TODO LRB JSP 160169569 should startup be passed Q1 here? - [M:startup(Q0) || M <- New -- Old], + _ = [M:startup(Q0) || M <- New -- Old], rabbit_amqqueue:update_decorators(Name) end. diff --git a/deps/rabbit/src/rabbit_queue_index.erl b/deps/rabbit/src/rabbit_queue_index.erl index 7acff5805dcc..34f956d674fc 100644 --- a/deps/rabbit/src/rabbit_queue_index.erl +++ b/deps/rabbit/src/rabbit_queue_index.erl @@ -333,8 +333,8 @@ recover(#resource{ virtual_host = VHost } = Name, Terms, MsgStoreRecovered, terminate(VHost, Terms, State = #qistate { dir = Dir }) -> {SegmentCounts, State1} = terminate(State), - rabbit_recovery_terms:store(VHost, filename:basename(Dir), - [{segments, SegmentCounts} | Terms]), + _ = rabbit_recovery_terms:store(VHost, filename:basename(Dir), + [{segments, SegmentCounts} | Terms]), State1. -spec delete_and_terminate(qistate()) -> qistate(). @@ -549,7 +549,7 @@ start(VHost, DurableQueueNames) -> sets:add_element(DirName, ValidDirectories)} end, {[], sets:new()}, DurableQueueNames), %% Any queue directory we've not been asked to recover is considered garbage - rabbit_file:recursive_delete( + _ = rabbit_file:recursive_delete( [DirName || DirName <- all_queue_directory_names(VHost), not sets:is_element(filename:basename(DirName), DurableDirectories)]), @@ -989,7 +989,7 @@ append_journal_to_segment(#segment { journal_entries = JEntries, %% might not be required here, but before we were doing a %% sparse_foldr, a lists:reverse/1 seems to be the correct %% thing to do for now. - file_handle_cache:append(Hdl, lists:reverse(array:to_list(EToSeg))), + _ = file_handle_cache:append(Hdl, lists:reverse(array:to_list(EToSeg))), ok = file_handle_cache:close(Hdl), Segment #segment { journal_entries = array_new(), entries_to_segment = array_new([]) } diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl index d91c680b9edf..88709c465156 100644 --- a/deps/rabbit/src/rabbit_quorum_queue.erl +++ b/deps/rabbit/src/rabbit_quorum_queue.erl @@ -512,7 +512,8 @@ repair_leader_record(QName, Self) -> rabbit_log:debug("~ts: repairing leader record", [rabbit_misc:rs(QName)]), {_, Name} = erlang:process_info(Self, registered_name), - become_leader(QName, Name) + become_leader(QName, Name), + ok end, ok. diff --git a/deps/rabbit/src/rabbit_reader.erl b/deps/rabbit/src/rabbit_reader.erl index a7a163b04211..6503748cb83a 100644 --- a/deps/rabbit/src/rabbit_reader.erl +++ b/deps/rabbit/src/rabbit_reader.erl @@ -503,8 +503,8 @@ mainloop(Deb, Buf, BufLen, State = #v1{sock = Sock, Fmt = "accepting AMQP connection ~tp (~ts)", Args = [self(), ConnName], case Recv of - closed -> rabbit_log_connection:debug(Fmt, Args); - _ -> rabbit_log_connection:info(Fmt, Args) + closed -> _ = rabbit_log_connection:debug(Fmt, Args); + _ -> _ = rabbit_log_connection:info(Fmt, Args) end; _ -> ok @@ -568,7 +568,7 @@ handle_other({'EXIT', Parent, normal}, State = #v1{parent = Parent}) -> stop(closed, State); handle_other({'EXIT', Parent, Reason}, State = #v1{parent = Parent}) -> Msg = io_lib:format("broker forced connection closure with reason '~w'", [Reason]), - terminate(Msg, State), + _ = terminate(Msg, State), %% this is what we are expected to do according to %% https://www.erlang.org/doc/man/sys.html %% @@ -858,7 +858,7 @@ handle_exception(State, Channel, Reason) -> %% more input -spec fatal_frame_error(_, _, _, _, _) -> no_return(). fatal_frame_error(Error, Type, Channel, Payload, State) -> - frame_error(Error, Type, Channel, Payload, State), + _ = frame_error(Error, Type, Channel, Payload, State), %% grace period to allow transmission of error timer:sleep(?SILENT_CLOSE_DELAY * 1000), throw(fatal_frame_error). @@ -1192,9 +1192,11 @@ handle_method0(#'connection.tune_ok'{frame_max = FrameMax, ok -> ok; {error, Reason} -> - Parent ! {heartbeat_send_error, Reason}; + Parent ! {heartbeat_send_error, Reason}, + ok; Unexpected -> - Parent ! {heartbeat_send_error, Unexpected} + Parent ! {heartbeat_send_error, Unexpected}, + ok end, ok end, diff --git a/deps/rabbit/src/rabbit_recovery_terms.erl b/deps/rabbit/src/rabbit_recovery_terms.erl index 2a766469e5b7..cae1a161e119 100644 --- a/deps/rabbit/src/rabbit_recovery_terms.erl +++ b/deps/rabbit/src/rabbit_recovery_terms.erl @@ -32,7 +32,8 @@ start(VHost) -> {?MODULE, {?MODULE, start_link, [VHost]}, transient, ?WORKER_WAIT, worker, - [?MODULE]}); + [?MODULE]}), + ok; %% we can get here if a vhost is added and removed concurrently %% e.g. some integration tests do it {error, {no_such_vhost, VHost}} -> @@ -75,7 +76,8 @@ read(VHost, DirBaseName) -> clear(VHost) -> try - dets:delete_all_objects(VHost) + _ = dets:delete_all_objects(VHost), + ok %% see start/1 catch _:badarg -> rabbit_log:error("Failed to clear recovery terms for vhost ~ts: table no longer exists!", @@ -91,7 +93,7 @@ start_link(VHost) -> init([VHost]) -> process_flag(trap_exit, true), - open_table(VHost), + _ = open_table(VHost), {ok, VHost}. handle_call(Msg, _, State) -> {stop, {unexpected_call, Msg}, State}. diff --git a/deps/rabbit/src/rabbit_runtime_parameters.erl b/deps/rabbit/src/rabbit_runtime_parameters.erl index d95b4c1d83b4..57a99c03d902 100644 --- a/deps/rabbit/src/rabbit_runtime_parameters.erl +++ b/deps/rabbit/src/rabbit_runtime_parameters.erl @@ -55,7 +55,7 @@ -type ok_or_error_string() :: 'ok' | {'error_string', string()}. -type ok_thunk_or_error_string() :: ok_or_error_string() | fun(() -> 'ok'). - +-export_type([ok_or_error_string/0]). %%--------------------------------------------------------------------------- -import(rabbit_misc, [pget/2]). @@ -105,7 +105,7 @@ parse_set_global(Name, String, ActingUser) -> set_global(Name, Term, ActingUser) -> NameAsAtom = rabbit_data_coercion:to_atom(Name), rabbit_log:debug("Setting global parameter '~ts' to ~tp", [NameAsAtom, Term]), - rabbit_db_rtparams:set(NameAsAtom, Term), + _ = rabbit_db_rtparams:set(NameAsAtom, Term), event_notify(parameter_set, none, global, [{name, NameAsAtom}, {value, Term}, {user_who_performed_action, ActingUser}]), diff --git a/deps/rabbit/src/rabbit_stream_coordinator.erl b/deps/rabbit/src/rabbit_stream_coordinator.erl index ce702d64983c..8f746f9b9fbe 100644 --- a/deps/rabbit/src/rabbit_stream_coordinator.erl +++ b/deps/rabbit/src/rabbit_stream_coordinator.erl @@ -1820,7 +1820,7 @@ eval_replica(_Meta, Node, #member{} = Replica, _LeaderState, _Stream, {Replicas#{Node => Replica}, Actions}. fail_active_actions(Streams, Exclude) -> - maps:map( + _ = maps:map( fun (_, #stream{id = Id, members = Members, mnesia = Mnesia}) diff --git a/deps/rabbit/src/rabbit_stream_queue.erl b/deps/rabbit/src/rabbit_stream_queue.erl index 306c2770dc2a..3b9698def214 100644 --- a/deps/rabbit/src/rabbit_stream_queue.erl +++ b/deps/rabbit/src/rabbit_stream_queue.erl @@ -237,7 +237,7 @@ consume(Q, Spec, QState0) when ?amqqueue_is_stream(Q) -> {error, _} = Err -> Err; {ok, OffsetSpec} -> - rabbit_stream_coordinator:register_local_member_listener(Q), + _ = rabbit_stream_coordinator:register_local_member_listener(Q), rabbit_core_metrics:consumer_created(ChPid, ConsumerTag, ExclusiveConsume, not NoAck, QName, ConsumerPrefetchCount, false, diff --git a/deps/rabbit/src/rabbit_table.erl b/deps/rabbit/src/rabbit_table.erl index 9ce8d4667c3b..b5d23071715c 100644 --- a/deps/rabbit/src/rabbit_table.erl +++ b/deps/rabbit/src/rabbit_table.erl @@ -39,7 +39,7 @@ create() -> ensure_secondary_indexes(), ok. --spec create(mnesia:table(), list()) -> rabbit_types:ok_or_error(any()). +-spec create(atom(), list()) -> rabbit_types:ok_or_error(any()). create(TableName, TableDefinition) -> TableDefinition1 = proplists:delete(match, TableDefinition), @@ -52,11 +52,12 @@ create(TableName, TableDefinition) -> throw({error, {table_creation_failed, TableName, TableDefinition1, Reason}}) end. --spec exists(mnesia:table()) -> boolean(). +-spec exists(atom()) -> boolean(). exists(Table) -> case mnesia:is_transaction() of true -> - mnesia_schema:get_tid_ts_and_lock(schema, read); + _ = mnesia_schema:get_tid_ts_and_lock(schema, read), + ok; false -> ok end, @@ -73,7 +74,7 @@ ensure_secondary_index(Table, Field) -> {aborted, {already_exists, Table, _}} -> ok end. --spec ensure_table_copy(mnesia:table(), node(), ram_copies | disc_copies) -> +-spec ensure_table_copy(atom(), node(), ram_copies | disc_copies) -> ok | {error, any()}. ensure_table_copy(TableName, Node, StorageType) -> rabbit_log:debug("Will add a local schema database copy for table '~ts'", [TableName]), @@ -152,7 +153,7 @@ retry_timeout() -> -spec force_load() -> 'ok'. -force_load() -> [mnesia:force_load_table(T) || T <- names()], ok. +force_load() -> _ = [mnesia:force_load_table(T) || T <- names()], ok. -spec is_present() -> boolean(). diff --git a/deps/rabbit/src/rabbit_time_travel_dbg.erl b/deps/rabbit/src/rabbit_time_travel_dbg.erl index e25d28f79d94..c24240644864 100644 --- a/deps/rabbit/src/rabbit_time_travel_dbg.erl +++ b/deps/rabbit/src/rabbit_time_travel_dbg.erl @@ -58,7 +58,7 @@ init() -> loop(Q) -> receive dump -> - file:write_file("time_travel.dbg", + _ = file:write_file("time_travel.dbg", [io_lib:format("~0p~n", [E]) || E <- queue:to_list(Q)]), loop(Q); print -> @@ -69,7 +69,8 @@ loop(Q) -> Msg -> case queue:len(Q) of 1000 -> - loop(queue:in(Msg, queue:out(Q))); + {_, Q1} = queue:out(Q), + loop(queue:in(Msg, Q1)); _ -> loop(queue:in(Msg, Q)) end diff --git a/deps/rabbit/src/rabbit_variable_queue.erl b/deps/rabbit/src/rabbit_variable_queue.erl index 3318a4f75775..378a8671c469 100644 --- a/deps/rabbit/src/rabbit_variable_queue.erl +++ b/deps/rabbit/src/rabbit_variable_queue.erl @@ -2317,7 +2317,8 @@ purge_pending_ack1(State = #vqstate { ram_pending_ack = RPA, %% from. remove_vhost_msgs_by_id(MsgIdsByStore, MSCState) -> [ok = msg_store_remove(MSCState, IsPersistent, MsgIds) - || {IsPersistent, MsgIds} <- maps:to_list(MsgIdsByStore)]. + || {IsPersistent, MsgIds} <- maps:to_list(MsgIdsByStore)], + ok. remove_transient_msgs_by_id(MsgIdsByStore, MSCState) -> case maps:find(false, MsgIdsByStore) of diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl index 3b3f8c5a3aec..bb9f834a051d 100644 --- a/deps/rabbit/src/rabbit_vhost.erl +++ b/deps/rabbit/src/rabbit_vhost.erl @@ -252,7 +252,7 @@ do_add(Name, Metadata, ActingUser) -> rabbit_log:info("Applied default operator policy to vhost '~tp': ~tp", [Name, Policy]) end, - [begin + _ = [begin Resource = rabbit_misc:r(Name, exchange, ExchangeName), rabbit_log:debug("Will declare an exchange ~tp", [Resource]), _ = rabbit_exchange:declare(Resource, Type, true, false, Internal, [], ActingUser) @@ -308,8 +308,8 @@ delete(VHost, ActingUser) -> %% modules, like `rabbit_amqqueue:delete_all_for_vhost(VHost)'. These new %% calls would be responsible for the atomicity, not this code. %% Clear the permissions first to prohibit new incoming connections when deleting a vhost - rabbit_auth_backend_internal:clear_permissions_for_vhost(VHost, ActingUser), - rabbit_auth_backend_internal:clear_topic_permissions_for_vhost(VHost, ActingUser), + _ = rabbit_auth_backend_internal:clear_permissions_for_vhost(VHost, ActingUser), + _ = rabbit_auth_backend_internal:clear_topic_permissions_for_vhost(VHost, ActingUser), QDelFun = fun (Q) -> rabbit_amqqueue:delete(Q, false, false, ActingUser) end, [begin Name = amqqueue:get_name(Q), diff --git a/deps/rabbit/src/rabbit_vhost_process.erl b/deps/rabbit/src/rabbit_vhost_process.erl index b0d8392c8c62..9e6419491d08 100644 --- a/deps/rabbit/src/rabbit_vhost_process.erl +++ b/deps/rabbit/src/rabbit_vhost_process.erl @@ -42,7 +42,7 @@ init([VHost]) -> %% Recover the vhost data and save it to vhost registry. ok = rabbit_vhost:recover(VHost), rabbit_vhost_sup_sup:save_vhost_process(VHost, self()), - timer:send_interval(?VHOST_CHECK_INTERVAL, check_vhost), + _ = timer:send_interval(?VHOST_CHECK_INTERVAL, check_vhost), true = erlang:garbage_collect(), {ok, VHost} catch _:Reason:Stacktrace -> diff --git a/deps/rabbit/src/rabbit_vhost_sup_sup.erl b/deps/rabbit/src/rabbit_vhost_sup_sup.erl index 96f25c820d0a..9081e7e826ab 100644 --- a/deps/rabbit/src/rabbit_vhost_sup_sup.erl +++ b/deps/rabbit/src/rabbit_vhost_sup_sup.erl @@ -44,7 +44,7 @@ init([]) -> %% This assumes that a single vhost termination should not shut down nodes %% unless the operator opts in. RestartStrategy = vhost_restart_strategy(), - ets:new(?MODULE, [named_table, public, {keypos, #vhost_sup.vhost}]), + _ = ets:new(?MODULE, [named_table, public, {keypos, #vhost_sup.vhost}]), {ok, {{simple_one_for_one, 0, 5}, [{rabbit_vhost, {rabbit_vhost_sup_wrapper, start_link, []}, RestartStrategy, ?SUPERVISOR_WAIT, supervisor, @@ -67,7 +67,7 @@ start_on_all_nodes(VHost) -> end. delete_on_all_nodes(VHost) -> - [ stop_and_delete_vhost(VHost, Node) || Node <- rabbit_nodes:all_running() ], + _ = [ stop_and_delete_vhost(VHost, Node) || Node <- rabbit_nodes:all_running() ], ok. stop_and_delete_vhost(VHost) -> diff --git a/deps/rabbit_common/src/supervisor2.erl b/deps/rabbit_common/src/supervisor2.erl index 244816cc436a..c3ad436cb27b 100644 --- a/deps/rabbit_common/src/supervisor2.erl +++ b/deps/rabbit_common/src/supervisor2.erl @@ -111,7 +111,7 @@ %%-------------------------------------------------------------------------- --export_type([sup_flags/0, child_spec/0, startchild_ret/0, strategy/0]). +-export_type([sup_flags/0, child_spec/0, startchild_ret/0, strategy/0, sup_name/0]). %%--------------------------------------------------------------------------