Skip to content

Commit 7b39231

Browse files
check_for_quorum_queues_without_an_elected_leader: handle --quiet and --silent
plus simplify function heads. References #13433.
1 parent db73767 commit 7b39231

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/check_for_quorum_queues_without_an_elected_leader_command.ex

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Copyright (c) 2007-2025 VMware, Inc. or its affiliates. All rights reserved.
66

77
defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckForQuorumQueuesWithoutAnElectedLeaderCommand do
8-
alias RabbitMQ.CLI.Core.DocGuide
8+
alias RabbitMQ.CLI.Core.{Config, DocGuide}
99

1010
@behaviour RabbitMQ.CLI.CommandBehaviour
1111

@@ -30,7 +30,7 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckForQuorumQueuesWithoutAnElected
3030
:ok
3131

3232
error_or_leaderless_queues ->
33-
{:error, :check_failed, error_or_leaderless_queues}
33+
{:error, error_or_leaderless_queues}
3434
end
3535
end
3636

@@ -43,15 +43,16 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckForQuorumQueuesWithoutAnElected
4343
}}
4444
end
4545

46-
def output(:ok, %{silent: true}) do
47-
{:ok, :check_passed}
48-
end
49-
50-
def output(:ok, %{node: node_name}) do
51-
{:ok, "Node #{node_name} reported all quorum queue as having responsive leader replicas"}
46+
def output(:ok, %{node: node_name} = opts) do
47+
case Config.output_less?(opts) do
48+
true ->
49+
{:ok, :check_passed}
50+
false ->
51+
{:ok, "Node #{node_name} reported all quorum queue as having responsive leader replicas"}
52+
end
5253
end
5354

54-
def output({:error, :check_failed, error_or_leaderless_queues}, %{node: node_name, formatter: "json"}) when is_list(error_or_leaderless_queues) do
55+
def output({:error, error_or_leaderless_queues}, %{node: node_name, formatter: "json"}) when is_list(error_or_leaderless_queues) do
5556
{:error, :check_failed,
5657
%{
5758
"result" => "error",
@@ -60,14 +61,14 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.CheckForQuorumQueuesWithoutAnElected
6061
}}
6162
end
6263

63-
def output({:error, :check_failed, error_or_leaderless_queues}, %{silent: true}) when is_list(error_or_leaderless_queues) do
64-
{:error, :check_failed, error_or_leaderless_queues}
65-
end
66-
67-
def output({:error, :check_failed, error_or_leaderless_queues}, %{vhost: _vhost}) when is_list(error_or_leaderless_queues) do
68-
lines = queue_lines(error_or_leaderless_queues)
69-
70-
{:error, :check_failed, Enum.join(lines, line_separator())}
64+
def output({:error, error_or_leaderless_queues}, opts) when is_list(error_or_leaderless_queues) do
65+
case Config.output_less?(opts) do
66+
true ->
67+
{:error, :check_failed}
68+
false ->
69+
lines = queue_lines(error_or_leaderless_queues)
70+
{:error, :check_failed, Enum.join(lines, line_separator())}
71+
end
7172
end
7273

7374
def usage() do

0 commit comments

Comments
 (0)