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

fix: bridge mqtt config schema, subscriptions with default QoS 0

This commit is contained in:
DDDHuang 2022-04-12 16:47:39 +08:00
parent 54d5dbec7c
commit 5b9452979d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_bridge_mqtt/priv/emqx_bridge_mqtt.schema
View File

@ -214,8 +214,19 @@
end,
Subscriptions = fun(Name) ->
Configs = cuttlefish_variable:filter_by_prefix("bridge.mqtt." ++ Name ++ ".subscription", Conf),
lists:zip([Topic || {_, Topic} <- lists:sort([{I, Topic} || {[_, _, _, "subscription", I, "topic"], Topic} <- Configs])],
[QoS || {_, QoS} <- lists:sort([{I, QoS} || {[_, _, _, "subscription", I, "qos"], QoS} <- Configs])])
Configs = cuttlefish_variable:filter_by_prefix("bridge.mqtt." ++ Name ++ ".subscription", Conf),
SubConfId = lists:usort([{T, I} || {[_, _, _, "subscription", I, "topic"], T} <- Configs]),
FindQoS = fun({T, I}) ->
QoSFilter = fun
({[_, _, _, "subscription", Index, "qos"], QoS}) -> I == Index andalso {true, QoS};
(_Topic) -> false
end,
case lists:filtermap(QoSFilter, Configs) of
[] -> {T, 0};
QoSList -> {T, hd(QoSList)}
end
end,
[FindQoS(TopicAndIndex) || TopicAndIndex <- SubConfId]
end,
IsNodeAddr = fun(Addr) ->
case string:tokens(Addr, "@") of