yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(delayed): fix that the query is not a cluster query

This commit is contained in:
lafirest 2022-03-10 14:27:03 +08:00
parent 09404c555f
commit eeb92dae23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx_modules/src/emqx_delayed.erl
View File

@ -48,6 +48,8 @@
, get_delayed_message/1 , get_delayed_message/1
, delete_delayed_message/1 , delete_delayed_message/1
, post_config_update/5 , post_config_update/5
, cluster_list/1
, cluster_query/4
]). ]).
-export([format_delayed/1]). -export([format_delayed/1]).
@ -130,6 +132,13 @@ set_max_delayed_messages(Max) ->
list(Params) -> list(Params) ->
emqx_mgmt_api:paginate(?TAB, Params, ?FORMAT_FUN). 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) ->
format_delayed(Delayed, false). format_delayed(Delayed, false).

2
apps/emqx_modules/src/emqx_delayed_api.erl
View File

@ -160,7 +160,7 @@ status(put, #{body := Body}) ->
update_config(Body). update_config(Body).
delayed_messages(get, #{query_string := Qs}) -> delayed_messages(get, #{query_string := Qs}) ->
{200, emqx_delayed:list(Qs)}. {200, emqx_delayed:cluster_list(Qs)}.
delayed_message(get, #{bindings := #{msgid := Id}}) -> delayed_message(get, #{bindings := #{msgid := Id}}) ->
case emqx_delayed:get_delayed_message(Id) of case emqx_delayed:get_delayed_message(Id) of