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

Merge pull request #7009 from HJianBo/fix-lwm2m-api-node-badmatch 

fix(lwm2m): fix querying lwm2m client list on the another node
This commit is contained in:
JianBo He 2022-02-15 14:58:18 +08:00 committed by GitHub
parent e1592c41d0 9fb53cb47d
commit cb5fe77706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES-4.3.md
View File

@ -20,6 +20,7 @@ File format:
### Bug fixes ### Bug fixes
* Fix case where publishing to a non-existent topic alias would crash the connection [#6979] * Fix case where publishing to a non-existent topic alias would crash the connection [#6979]
* Fix HTTP-API 500 error on querying the lwm2m client list on the another node [#7009]
## v4.3.12 ## v4.3.12
### Important changes ### Important changes

13
apps/emqx_lwm2m/src/emqx_lwm2m.app.src
View File

@ -1,7 +1,8 @@
{application,emqx_lwm2m, {application,emqx_lwm2m,
[{description,"EMQ X LwM2M Gateway"}, [{description,"EMQ X LwM2M Gateway"},
{vsn, "4.3.5"}, % strict semver, bump manually! {vsn, "4.3.6"}, % strict semver, bump manually!
{modules,[]}, {modules,[]},
{registered,[emqx_lwm2m_sup]}, {registered,[emqx_lwm2m_sup]},
{applications,[kernel,stdlib,lwm2m_coap]}, {applications,[kernel,stdlib,lwm2m_coap]},
{mod,{emqx_lwm2m_app,[]}}]}. {mod,{emqx_lwm2m_app,[]}}]
}.

16
apps/emqx_lwm2m/src/emqx_lwm2m.appup.src
View File

@ -4,13 +4,17 @@
[{restart_application,emqx_lwm2m}]}, [{restart_application,emqx_lwm2m}]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
{load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}]}, {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]},
{"4.3.3",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]},
{"4.3.4",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}], {<<"4\\.3\\.[3-5]">>,
[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
{load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}],
[{<<"4\\.3\\.[0-1]">>, [{<<"4\\.3\\.[0-1]">>,
[{restart_application,emqx_lwm2m}]}, [{restart_application,emqx_lwm2m}]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, [{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
{load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}]}, {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]},
{"4.3.3",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]},
{"4.3.4",[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}]}]}. {<<"4\\.3\\.[3-5]">>,
[{load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]},
{load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}]}.

4
apps/emqx_lwm2m/src/emqx_lwm2m_api.erl
View File

@ -51,7 +51,7 @@
]). ]).
list(#{node := Node }, Params) -> list(#{node := Node }, Params) ->
case Node = node() of case Node =:= node() of
true -> list(#{}, Params); true -> list(#{}, Params);
_ -> rpc_call(Node, list, [#{}, Params]) _ -> rpc_call(Node, list, [#{}, Params])
end; end;
@ -61,7 +61,7 @@ list(#{}, _Params) ->
return({ok, format(Channels)}). return({ok, format(Channels)}).
lookup_cmd(#{ep := Ep, node := Node}, Params) -> lookup_cmd(#{ep := Ep, node := Node}, Params) ->
case Node = node() of case Node =:= node() of
true -> lookup_cmd(#{ep => Ep}, Params); true -> lookup_cmd(#{ep => Ep}, Params);
_ -> rpc_call(Node, lookup_cmd, [#{ep => Ep}, Params]) _ -> rpc_call(Node, lookup_cmd, [#{ep => Ep}, Params])
end; end;