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

fix: delayed message format & message id parameter name (#5762)

This commit is contained in:
DDDHuang 2021-09-22 10:04:00 +08:00 committed by GitHub
parent f0e58d0c9b
commit ab2cdfeab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ format_delayed(#delayed_message{key = {ExpectTimeStamp, Id}, delayed = Delayed,
ExpectTime = to_rfc3339(ExpectTimeStamp), ExpectTime = to_rfc3339(ExpectTimeStamp),
RemainingTime = ExpectTimeStamp - erlang:system_time(second), RemainingTime = ExpectTimeStamp - erlang:system_time(second),
Result = #{ Result = #{
id => emqx_guid:to_hexstr(Id), msgid => emqx_guid:to_hexstr(Id),
publish_at => PublishTime, publish_at => PublishTime,
delayed_interval => Delayed, delayed_interval => Delayed,
delayed_remaining => RemainingTime, delayed_remaining => RemainingTime,

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

@ -59,7 +59,7 @@ properties() ->
PayloadDesc = io_lib:format("Payload, base64 encode. Payload will be ~p if length large than ~p", PayloadDesc = io_lib:format("Payload, base64 encode. Payload will be ~p if length large than ~p",
[?PAYLOAD_TOO_LARGE, ?MAX_PAYLOAD_LENGTH]), [?PAYLOAD_TOO_LARGE, ?MAX_PAYLOAD_LENGTH]),
properties([ properties([
{id, integer, <<"Message Id (MQTT message id hash)">>}, {msgid, integer, <<"Message Id">>},
{publish_at, string, <<"Client publish message time, rfc 3339">>}, {publish_at, string, <<"Client publish message time, rfc 3339">>},
{delayed_interval, integer, <<"Delayed interval, second">>}, {delayed_interval, integer, <<"Delayed interval, second">>},
{delayed_remaining, integer, <<"Delayed remaining, second">>}, {delayed_remaining, integer, <<"Delayed remaining, second">>},
@ -73,7 +73,7 @@ properties() ->
parameters() -> parameters() ->
[#{ [#{
name => id, name => msgid,
in => path, in => path,
schema => #{type => string}, schema => #{type => string},
required => true required => true
@ -129,7 +129,7 @@ delayed_message_api() ->
} }
} }
}, },
{"/mqtt/delayed/messages/:id", Metadata, delayed_message}. {"/mqtt/delayed/messages/:msgid", Metadata, delayed_message}.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% HTTP API %% HTTP API
@ -143,7 +143,7 @@ status(put, #{body := Body}) ->
delayed_messages(get, #{query_string := Qs}) -> delayed_messages(get, #{query_string := Qs}) ->
{200, emqx_delayed:list(Qs)}. {200, emqx_delayed:list(Qs)}.
delayed_message(get, #{bindings := #{id := Id}}) -> delayed_message(get, #{bindings := #{msgid := Id}}) ->
case emqx_delayed:get_delayed_message(Id) of case emqx_delayed:get_delayed_message(Id) of
{ok, Message} -> {ok, Message} ->
Payload = maps:get(payload, Message), Payload = maps:get(payload, Message),
@ -157,7 +157,7 @@ delayed_message(get, #{bindings := #{id := Id}}) ->
Message = iolist_to_binary(io_lib:format("Message ID ~p not found", [Id])), Message = iolist_to_binary(io_lib:format("Message ID ~p not found", [Id])),
{404, #{code => ?MESSAGE_ID_NOT_FOUND, message => Message}} {404, #{code => ?MESSAGE_ID_NOT_FOUND, message => Message}}
end; end;
delayed_message(delete, #{bindings := #{id := Id}}) -> delayed_message(delete, #{bindings := #{msgid := Id}}) ->
_ = emqx_delayed:delete_delayed_message(Id), _ = emqx_delayed:delete_delayed_message(Id),
{200}. {200}.