Remove ignore_loop_deliver option
This commit is contained in:
parent
1607e576de
commit
8e11845f87
|
@ -605,12 +605,6 @@ zone.external.max_awaiting_rel = 100
|
||||||
## Value: Duration
|
## Value: Duration
|
||||||
zone.external.await_rel_timeout = 60s
|
zone.external.await_rel_timeout = 60s
|
||||||
|
|
||||||
## Whether to ignore loop delivery of messages.
|
|
||||||
##
|
|
||||||
## Value: true | false
|
|
||||||
## Default: false
|
|
||||||
zone.external.ignore_loop_deliver = false
|
|
||||||
|
|
||||||
## Default session expiry interval for MQTT V3.1.1 connections.
|
## Default session expiry interval for MQTT V3.1.1 connections.
|
||||||
##
|
##
|
||||||
## Value: Duration
|
## Value: Duration
|
||||||
|
|
|
@ -769,7 +769,6 @@ end}.
|
||||||
|
|
||||||
%% @doc Ignore loop delivery of messages
|
%% @doc Ignore loop delivery of messages
|
||||||
{mapping, "zone.$name.ignore_loop_deliver", "emqx.zones", [
|
{mapping, "zone.$name.ignore_loop_deliver", "emqx.zones", [
|
||||||
{default, false},
|
|
||||||
{datatype, {enum, [true, false]}}
|
{datatype, {enum, [true, false]}}
|
||||||
]}.
|
]}.
|
||||||
|
|
||||||
|
|
|
@ -331,7 +331,7 @@ parse_variable_byte_integer(<<0:1, Len:7, Rest/binary>>, Multiplier, Value) ->
|
||||||
{Value + Len * Multiplier, Rest}.
|
{Value + Len * Multiplier, Rest}.
|
||||||
|
|
||||||
parse_topic_filters(subscribe, Bin) ->
|
parse_topic_filters(subscribe, Bin) ->
|
||||||
[{Topic, #{rh => Rh, rap => Rap, nl => Nl, qos => QoS, rc => 0, subid => 0}}
|
[{Topic, #{rh => Rh, rap => Rap, nl => Nl, qos => QoS, rc => 0}}
|
||||||
|| <<Len:16/big, Topic:Len/binary, _:2, Rh:2, Rap:1, Nl:1, QoS:2>> <= Bin];
|
|| <<Len:16/big, Topic:Len/binary, _:2, Rh:2, Rap:1, Nl:1, QoS:2>> <= Bin];
|
||||||
|
|
||||||
parse_topic_filters(unsubscribe, Bin) ->
|
parse_topic_filters(unsubscribe, Bin) ->
|
||||||
|
|
|
@ -611,9 +611,10 @@ code_change(_OldVsn, State, _Extra) ->
|
||||||
%% Internal functions
|
%% Internal functions
|
||||||
%%------------------------------------------------------------------------------
|
%%------------------------------------------------------------------------------
|
||||||
|
|
||||||
with_subid(#{'Subscription-Identifier' := SubId}, Opts) ->
|
with_subid(#{'Subscription-Identifier' := SubId}, SubOpts) ->
|
||||||
maps:put(subid, SubId, Opts);
|
maps:put(subid, SubId, SubOpts);
|
||||||
with_subid(_Props, Opts) -> Opts.
|
with_subid(_Props, SubOpts) ->
|
||||||
|
SubOpts.
|
||||||
|
|
||||||
suback(_From, undefined, _ReasonCodes) ->
|
suback(_From, undefined, _ReasonCodes) ->
|
||||||
ignore;
|
ignore;
|
||||||
|
|
Loading…
Reference in New Issue