summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@novemberain.com>2019-03-18 05:53:04 +0300
committerGitHub <noreply@github.com>2019-03-18 05:53:04 +0300
commita58bc89f73c9af27fda43adcb2639b1f474b5aa5 (patch)
tree3b30a1d24afe6a26afead7d7f9840f666214b012
parent2f8053da4213e4d4d5df5c2f6dc6871b7054d844 (diff)
parente576234e94318f65dbbf2b98257071d42030382f (diff)
downloadrabbitmq-server-git-a58bc89f73c9af27fda43adcb2639b1f474b5aa5.tar.gz
Merge pull request #1918 from rabbitmq/list-queue-type
Add queue type to queue listing commands
-rw-r--r--src/rabbit_amqqueue.erl1
-rw-r--r--src/rabbit_amqqueue_process.erl1
-rw-r--r--src/rabbit_quorum_queue.erl1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 5488a88836..54337311ed 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -969,6 +969,7 @@ i_down(auto_delete, Q, _) -> amqqueue:is_auto_delete(Q);
i_down(arguments, Q, _) -> amqqueue:get_arguments(Q);
i_down(pid, Q, _) -> amqqueue:get_pid(Q);
i_down(recoverable_slaves, Q, _) -> amqqueue:get_recoverable_slaves(Q);
+i_down(type, Q, _) -> amqqueue:get_type(Q);
i_down(state, _Q, DownReason) -> DownReason;
i_down(K, _Q, _DownReason) ->
case lists:member(K, rabbit_amqqueue_process:info_keys()) of
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index e1978a9173..e9c091daa0 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1128,6 +1128,7 @@ i(reductions, _State) ->
i(user_who_performed_action, #q{q = Q}) ->
Opts = amqqueue:get_options(Q),
maps:get(user, Opts, ?UNKNOWN_USER);
+i(type, _) -> classic;
i(Item, #q{backing_queue_state = BQS, backing_queue = BQ}) ->
BQ:info(Item, BQS).
diff --git a/src/rabbit_quorum_queue.erl b/src/rabbit_quorum_queue.erl
index c685785d0d..8920c8cf0d 100644
--- a/src/rabbit_quorum_queue.erl
+++ b/src/rabbit_quorum_queue.erl
@@ -967,6 +967,7 @@ i(single_active_consumer_ctag, Q) when ?is_amqqueue(Q) ->
_ ->
''
end;
+i(type, _) -> quorum;
i(_K, _Q) -> ''.
open_files(Name) ->