From 5d1772a6b4af86ea07cef6ae250fbdc13e9523ef Mon Sep 17 00:00:00 2001 From: zhanghongtong Date: Sat, 9 Oct 2021 14:11:26 +0800 Subject: [PATCH] fix(authz api): fix error for move source when disable source --- apps/emqx_authz/src/emqx_authz.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl index d1a3f6ad5..d8ab36b32 100644 --- a/apps/emqx_authz/src/emqx_authz.erl +++ b/apps/emqx_authz/src/emqx_authz.erl @@ -159,6 +159,7 @@ do_post_update(_, NewSources) -> lists:foreach(fun ensure_resource_deleted/1, OldInitedSources), ok = emqx_authz_cache:drain_cache(). +ensure_resource_deleted(#{enable := false}) -> ok; ensure_resource_deleted(#{type := file}) -> ok; ensure_resource_deleted(#{type := 'built-in-database'}) -> ok; ensure_resource_deleted(#{annotations := #{id := Id}}) -> ok = emqx_resource:remove(Id). @@ -186,13 +187,14 @@ check_dup_types([Source | Sources], Checked) -> end. init_sources(Sources) -> - {Enabled, Disabled} = lists:partition(fun(#{enable := Enable}) -> Enable end, Sources), + {_Enabled, Disabled} = lists:partition(fun(#{enable := Enable}) -> Enable end, Sources), case Disabled =/= [] of true -> ?SLOG(info, #{msg => "disabled_sources_ignored", sources => Disabled}); false -> ok end, - lists:map(fun init_source/1, Enabled). + lists:map(fun init_source/1, Sources). +init_source(#{enable := false} = Source) -> Source; init_source(#{type := file, path := Path } = Source) ->