Skip to content

Commit a8b4b48

Browse files
Fix issue
1 parent 3b0e70c commit a8b4b48

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

deps/rabbitmq_management/src/rabbit_mgmt_db.erl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,17 +366,18 @@ list_queue_stats(Ranges, Objs, Interval) ->
366366
[proplists:proplist()].
367367
list_core_queue_data(Ranges, Objs) ->
368368
Ids = [id_lookup(queue_stats, Obj) || Obj <- Objs],
369-
DataLookup = get_data_from_nodes({rabbit_mgmt_data, all_list_basic_queue_data, [Ids, Ranges]}),
369+
DataLookup = get_data_from_nodes({rabbit_mgmt_data, all_detail_queue_data, [Ids, Ranges]}),
370370
adjust_hibernated_memory_use(
371371
[begin
372372
Id = id_lookup(queue_stats, Obj),
373373
Pid = pget(pid, Obj),
374374
QueueData = maps:get(Id, DataLookup),
375375
Props = maps:get(queue_stats, QueueData),
376376
ConsumerStats = rabbit_mgmt_data_compat:fill_consumer_active_fields(
377-
maps:get(consumer_stats, QueueData)),
377+
maps:get(consumer_stats, QueueData)),
378+
Consumers = [{consumer_details, ConsumerStats}],
378379

379-
{Pid, combine(Props, Obj) ++ ConsumerStats}
380+
{Pid, combine(Props, Obj) ++ Consumers}
380381
end || Obj <- Objs]).
381382

382383
-spec list_basic_queue_stats(ranges(), [proplists:proplist()], integer()) ->

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ to_json(ReqData, Context) ->
4848
rabbit_mgmt_format:strip_pids(Q)),
4949
rabbit_mgmt_util:reply(ensure_defaults(Payload), ReqData, Context);
5050
true ->
51-
Q = case rabbit_mgmt_util:enable_queue_totals(ReqData) of
52-
false -> rabbit_mgmt_db:list_core_queue_data([queue(ReqData)],
53-
[queue(ReqData)], core);
54-
true -> queue_with_totals(ReqData)
51+
[Q] = case rabbit_mgmt_util:enable_queue_totals(ReqData) of
52+
false -> rabbit_mgmt_db:augment_queues([queue(ReqData)],
53+
rabbit_mgmt_util:range_ceil(ReqData), core);
54+
true -> [queue_with_totals(ReqData)]
5555
end,
5656
rabbit_mgmt_util:reply(
5757
rabbit_mgmt_format:strip_pids(Q),

0 commit comments

Comments
 (0)