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

Merge pull request #1800 from terry-xiaoyu/ignor_zero_will_delay 

Ignore Will-Delay-Interval = 0
This commit is contained in:
turtleDeng 2018-09-08 10:40:12 +08:00 committed by GitHub
parent c0ddbba5db 2121da3755
commit c8341c85ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqx_protocol.erl
View File

@ -370,7 +370,7 @@ process_packet(?SUBSCRIBE_PACKET(PacketId, Properties, RawTopicFilters),
end; end;
true -> true ->
RawTopicFilters RawTopicFilters
end, end,
case check_subscribe( case check_subscribe(
parse_topic_filters(?SUBSCRIBE, RawTopicFilters1), PState) of parse_topic_filters(?SUBSCRIBE, RawTopicFilters1), PState) of
{ok, TopicFilters} -> {ok, TopicFilters} ->
@ -732,7 +732,8 @@ shutdown(Reason, PState = #pstate{connected = true,
send_willmsg(undefined) -> send_willmsg(undefined) ->
ignore; ignore;
send_willmsg(WillMsg = #message{topic = Topic, send_willmsg(WillMsg = #message{topic = Topic,
headers = #{'Will-Delay-Interval' := Interval}}) when is_integer(Interval) -> headers = #{'Will-Delay-Interval' := Interval}})
when is_integer(Interval), Interval > 0 ->
SendAfter = integer_to_binary(Interval), SendAfter = integer_to_binary(Interval),
emqx_broker:publish(WillMsg#message{topic = <<"$delayed/", SendAfter/binary, "/", Topic/binary>>}); emqx_broker:publish(WillMsg#message{topic = <<"$delayed/", SendAfter/binary, "/", Topic/binary>>});
send_willmsg(WillMsg) -> send_willmsg(WillMsg) ->