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

Merge pull request #7266 from lafirest/fix/topic_rewrite 

fix(rewrite): fix config update maybe not work
This commit is contained in:
lafirest 2022-03-10 18:41:54 +08:00 committed by GitHub
parent 6d272970f4 2b2104851a
commit 40f0f61744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/emqx_modules/src/emqx_rewrite.erl
View File

@ -52,9 +52,7 @@ enable() ->
disable() -> disable() ->
emqx_conf:remove_handler([rewrite]), emqx_conf:remove_handler([rewrite]),
emqx_hooks:del('client.subscribe', {?MODULE, rewrite_subscribe}), unregister_hook(),
emqx_hooks:del('client.unsubscribe', {?MODULE, rewrite_unsubscribe}),
emqx_hooks:del('message.publish', {?MODULE, rewrite_publish}),
ok. ok.
list() -> list() ->
@ -67,7 +65,7 @@ update(Rules0) ->
post_config_update(_KeyPath, _Config, Rules, _OldConf, _AppEnvs) -> post_config_update(_KeyPath, _Config, Rules, _OldConf, _AppEnvs) ->
register_hook(Rules). register_hook(Rules).
register_hook([]) -> disable(); register_hook([]) -> unregister_hook();
register_hook(Rules) -> register_hook(Rules) ->
{PubRules, SubRules, ErrRules} = compile(Rules), {PubRules, SubRules, ErrRules} = compile(Rules),
emqx_hooks:put('client.subscribe', {?MODULE, rewrite_subscribe, [SubRules]}), emqx_hooks:put('client.subscribe', {?MODULE, rewrite_subscribe, [SubRules]}),
@ -80,6 +78,11 @@ register_hook(Rules) ->
{error, ErrRules} {error, ErrRules}
end. end.
unregister_hook() ->
emqx_hooks:del('client.subscribe', {?MODULE, rewrite_subscribe}),
emqx_hooks:del('client.unsubscribe', {?MODULE, rewrite_unsubscribe}),
emqx_hooks:del('message.publish', {?MODULE, rewrite_publish}).
rewrite_subscribe(_ClientInfo, _Properties, TopicFilters, Rules) -> rewrite_subscribe(_ClientInfo, _Properties, TopicFilters, Rules) ->
{ok, [{match_and_rewrite(Topic, Rules), Opts} || {Topic, Opts} <- TopicFilters]}. {ok, [{match_and_rewrite(Topic, Rules), Opts} || {Topic, Opts} <- TopicFilters]}.