sync with mac air

src/emqttd_plugin_mgr.erl

@@ -25,7 +25,7 @@
 %%% @end
 %%%-----------------------------------------------------------------------------
 
--module(emqttd_plugin_manager).
+-module(emqttd_plugin_mgr).
 
 -author("Feng Lee <feng@emqtt.io>").
 
@@ -33,31 +33,28 @@
 
 -export([start/0, list/0, load/1, unload/1, stop/0]).
 
-start() ->
-    %% start all plugins
-    %%
-    ok.
-
 %%------------------------------------------------------------------------------
 %% @doc Load all plugins
 %% @end
 %%------------------------------------------------------------------------------
--spec load_all_plugins() -> [{App :: atom(), ok | {error, any()}}].
+-spec start() -> ok | {error, any()}.
-load_all_plugins() ->
+start() ->
-    %% save first
+    case read_loaded() of
-    case file:consult("etc/plugins.config") of
+        {ok, AppNames} ->
-        {ok, [PluginApps]} ->
+            NotFound = AppNames -- apps(plugin),
-            ok;
+            case NotFound of
-            %% application:set_env(emqttd, plugins, [App || {App, _Env} <- PluginApps]),
+                [] -> ok;
-            %% [{App, load_plugin(App)} || {App, _Env} <- PluginApps];
+                NotFound -> lager:error("Cannot find plugins: ~p", [NotFound])
-        {error, enoent} ->
+            end,
-            lager:error("etc/plugins.config not found!");
+            {ok, start_apps(AppNames -- NotFound -- apps(started))};
         {error, Error} ->
-            lager:error("Load etc/plugins.config error: ~p", [Error])
+            lager:error("Read loaded_plugins file error: ~p", [Error]),
+            {error, Error}
     end.
 
 %%------------------------------------------------------------------------------
-%% List all available plugins
+%% @doc List all available plugins
+%% @end
 %%------------------------------------------------------------------------------
 list() ->
     {ok, PluginEnv} = application:get_env(emqttd, plugins),
@@ -74,7 +71,7 @@ list() ->
 
 plugin(AppFile) ->
     {ok, [{application, Name, Attrs}]} = file:consult(AppFile),
-    Ver = proplists:get_value(vsn, Attrs),
+    Ver = proplists:get_value(vsn, Attrs, "0"),
     Descr = proplists:get_value(description, Attrs, ""),
     #mqtt_plugin{name = Name, version = Ver, descr = Descr}.
 
@@ -84,40 +81,40 @@ plugin(AppFile) ->
 %%------------------------------------------------------------------------------
 -spec load(atom()) -> ok | {error, any()}.
 load(PluginName) when is_atom(PluginName) ->
-    %% start plugin
+    case lists:member(PluginName, apps(started)) of
-    %% write file if plugin is loaded
+        true ->
-    ok.
+            lager:info("plugin ~p is started", [PluginName]),
-
+            {error, already_started};
--spec load_plugin(App :: atom()) -> ok | {error, any()}.
+        false ->
-load_plugin(App) ->
+            case lists:member(PluginName, apps(plugin)) of
-    case load_app(App) of
+                true ->
-        ok ->
+                    load_plugin(PluginName);
-            start_app(App);
+                false ->
-        {error, Reason} ->
+                    lager:info("plugin ~p is not found", [PluginName]),
-            {error, Reason}
+                    {error, not_foun}
+            end
     end.
-
+    
-load_app(App) ->
+-spec load_plugin(App :: atom()) -> {ok, list()} | {error, any()}.
-    case application:load(App) of
+load_plugin(PluginName) ->
-        ok ->
+    case start_app(PluginName) of
-            lager:info("load plugin ~p successfully", [App]), ok;
+        {ok, Started} ->
-        {error, {already_loaded, App}} ->
+            plugin_loaded(PluginName),
-            lager:info("load plugin ~p is already loaded", [App]), ok;
+            {ok, Started};
-        {error, Reason} ->
+        {error, Error} ->
-            lager:error("load plugin ~p error: ~p", [App, Reason]), {error, Reason}
+            {error, Error}
     end.
 
 start_app(App) ->
-    case application:start(App) of
+    case application:ensure_all_started(App) of
-        ok ->
+        {ok, Started} ->
-            lager:info("start plugin ~p successfully", [App]), ok;
+            lager:info("started apps: ~p, load plugin ~p successfully", [Started, App]),
-        {error, {already_started, App}} ->
+            {ok, Started};
-            lager:error("plugin ~p is already started", [App]), ok;
+        {error, {ErrApp, Reason}} ->
-        {error, Reason} ->
+            lager:error("load plugin ~p error, cannot start app ~s for ~p", [App, ErrApp, Reason]),
-            lager:error("start plugin ~p error: ~p", [App, Reason]), {error, Reason}
+            {error, {ErrApp, Reason}}
     end.
 
-
 %%------------------------------------------------------------------------------
 %% @doc UnLoad Plugin
 %% @end
@@ -159,14 +156,55 @@ unload_app(App) ->
 
 stop() ->
     %% stop all plugins
+    PluginApps = application:get_env(emqttd, plugins, []),
+    %%[{App, unload_plugin(App)} || App <- PluginApps].
     ok.
 
-%%------------------------------------------------------------------------------
+%%%=============================================================================
-%% @doc Unload all plugins
+%%% Internal functions
-%% @end
+%%%=============================================================================
-%%------------------------------------------------------------------------------
+
--spec unload_all_plugins() -> [{App :: atom(), ok | {error, any()}}].
+start_apps(Apps) ->
-unload_all_plugins() ->
+    [start_app(App) || App <- Apps].
-    PluginApps = application:get_env(emqttd, plugins, []).
+
-    %%[{App, unload_plugin(App)} || App <- PluginApps].
+stop_apps(Apps) ->
+    [stop_app(App) || App <- Apps].
+
+apps(plugin) ->
+    [Name || #mqtt_plugin{name = Name} <- list()];
+
+apps(started) ->
+    [Name || {Name, _Descr, _Ver} <- application:which_applications()].
+
+plugin_loaded(Name) ->
+    case read_loaded() of
+        {ok, Names} ->
+            case lists:member(Name, Names) of
+                true ->
+                    ok;
+                false ->
+                    %% write file if plugin is loaded
+                    write_loaded(lists:append(Names, Name))
+            end;
+        {error, Error} ->
+            lager:error("Cannot read loaded plugins: ~p", [Error])
+    end.
+
+
+
+read_loaded() ->
+    {ok, PluginEnv} = application:get_env(emqttd, plugins),
+    LoadedFile = proplists:get_value(loaded_file, PluginEnv, "./data/loaded_plugins"),
+    file:consult(LoadedFile).
+
+write_loaded(AppNames) ->
+    {ok, PluginEnv} = application:get_env(emqttd, plugins),
+    LoadedFile = proplists:get_value(loaded_file, PluginEnv, "./data/loaded_plugins"),
+    case file:open(LoadedFile, [binary, write]) of
+        {ok, Fd} ->
+            Line = list_to_binary(io_lib:format("~w.~n", [AppNames])),
+            file:write(Fd, Line);
+        {error, Error} ->
+            {error, Error}
+    end.