Reuse plugin filter logic to adapt to emqx rebar3 release

emqx · May 6, 2019 · 4e3278a · 4e3278a
1 parent b040d37
commit 4e3278a
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl
@@ -108,13 +108,20 @@ ensure_file(File) ->
 
 with_loaded_file(File, SuccFun) ->
     case read_loaded(File) of
-        {ok, Names} ->
+        {ok, Names0} ->
+            Names = filter_plugins(Names0),
             SuccFun(Names);
         {error, Error} ->
             ?LOG(alert, "[Plugins] Failed to read: ~p, error: ~p", [File, Error]),
             {error, Error}
     end.
 
+filter_plugins(Names) ->
+    lists:filtermap(fun(Name1) when is_atom(Name1) -> {true, Name1};
+                       ({Name1, true}) -> {true, Name1};
+                       ({_Name1, false}) -> false
+                    end, Names).
+
 load_plugins(Names, Persistent) ->
     Plugins = list(), NotFound = Names -- names(Plugins),
     case NotFound of
@@ -277,10 +284,7 @@ plugin_unloaded(_Name, false) ->
 plugin_unloaded(Name, true) ->
     case read_loaded() of
         {ok, Names0} ->
-            Names = lists:filtermap(fun(Name1) when is_atom(Name1) -> {true, Name1};
-                                       ({Name1, true}) -> {true, Name1};
-                                       ({_Name1, false}) -> false
-                                    end, Names0),
+            Names = filter_plugins(Names0),
             case lists:member(Name, Names) of
                 true ->
                     write_loaded(lists:delete(Name, Names));