From eeb92dae238fb1e1483e79488547bbccccd9b879 Mon Sep 17 00:00:00 2001 From: lafirest Date: Thu, 10 Mar 2022 14:27:03 +0800 Subject: [PATCH] fix(delayed): fix that the query is not a cluster query --- apps/emqx_modules/src/emqx_delayed.erl | 9 +++++++++ apps/emqx_modules/src/emqx_delayed_api.erl | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/emqx_modules/src/emqx_delayed.erl b/apps/emqx_modules/src/emqx_delayed.erl index 8be7e1419..05b65516c 100644 --- a/apps/emqx_modules/src/emqx_delayed.erl +++ b/apps/emqx_modules/src/emqx_delayed.erl @@ -48,6 +48,8 @@ , get_delayed_message/1 , delete_delayed_message/1 , post_config_update/5 + , cluster_list/1 + , cluster_query/4 ]). -export([format_delayed/1]). @@ -130,6 +132,13 @@ set_max_delayed_messages(Max) -> list(Params) -> emqx_mgmt_api:paginate(?TAB, Params, ?FORMAT_FUN). +cluster_list(Params) -> + emqx_mgmt_api:cluster_query(Params, ?TAB, [], {?MODULE, cluster_query}). + +cluster_query(Table, _QsSpec, Continuation, Limit) -> + Ms = [{'$1', [], ['$1']}], + emqx_mgmt_api:select_table_with_count(Table, Ms, Continuation, Limit, fun format_delayed/1). + format_delayed(Delayed) -> format_delayed(Delayed, false). diff --git a/apps/emqx_modules/src/emqx_delayed_api.erl b/apps/emqx_modules/src/emqx_delayed_api.erl index cee9298ea..b6756c695 100644 --- a/apps/emqx_modules/src/emqx_delayed_api.erl +++ b/apps/emqx_modules/src/emqx_delayed_api.erl @@ -160,7 +160,7 @@ status(put, #{body := Body}) -> update_config(Body). delayed_messages(get, #{query_string := Qs}) -> - {200, emqx_delayed:list(Qs)}. + {200, emqx_delayed:cluster_list(Qs)}. delayed_message(get, #{bindings := #{msgid := Id}}) -> case emqx_delayed:get_delayed_message(Id) of