From 116c5931789dce0b2644437aedff6bc069ff5fa4 Mon Sep 17 00:00:00 2001
From: tigercl <zhouzb@emqx.io>
Date: Fri, 20 Dec 2019 16:34:07 +0800
Subject: [PATCH] Fix returned value of plugin reloading (#3126)

---
 etc/emqx.conf               | 2 --
 src/emqx_plugins.erl        | 2 +-
 test/emqx_plugins_SUITE.erl | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/etc/emqx.conf b/etc/emqx.conf
index 0ec84f7ae..98e44f4a8 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -261,8 +261,6 @@ node.fullsweep_after = 1000
 ## Value: Log file
 node.crash_dump = {{ platform_log_dir }}/crash.dump
 
-
-
 ## Specify SSL Options in the file if using SSL for Erlang Distribution.
 ##
 ## Value: File
diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl
index d17053894..fb80152f5 100644
--- a/src/emqx_plugins.erl
+++ b/src/emqx_plugins.erl
@@ -213,7 +213,7 @@ start_app(App, SuccFun) ->
             ?LOG(info, "Started plugins: ~p", [Started]),
             ?LOG(info, "Load plugin ~s successfully", [App]),
             SuccFun(App),
-            {ok, Started};
+            ok;
         {error, {ErrApp, Reason}} ->
             ?LOG(error, "Load plugin ~s failed, cannot start plugin ~s for ~p", [App, ErrApp, Reason]),
             {error, {ErrApp, Reason}}
diff --git a/test/emqx_plugins_SUITE.erl b/test/emqx_plugins_SUITE.erl
index 29d3d5964..1343076d6 100644
--- a/test/emqx_plugins_SUITE.erl
+++ b/test/emqx_plugins_SUITE.erl
@@ -59,7 +59,7 @@ t_load(_) ->
     ?assertEqual([], emqx_plugins:unload()),
 
     ?assertEqual({error, not_found}, emqx_plugins:load(not_existed_plugin)),
-    ?assertMatch({ok, _}, emqx_plugins:load(emqx_mini_plugin)),
+    ?assertMatch(ok, emqx_plugins:load(emqx_mini_plugin)),
     ?assertEqual({error, already_started}, emqx_plugins:load(emqx_mini_plugin)),
     ?assertEqual(ok, emqx_plugins:unload(emqx_mini_plugin)),
     ?assertEqual({error, not_started}, emqx_plugins:unload(emqx_mini_plugin)),
@@ -127,7 +127,7 @@ t_load_plugin(_) ->
                                                             (App) -> {ok, App} end),
 
     ?assertMatch({error, _}, emqx_plugins:load_plugin(#plugin{name = already_loaded_app}, true)),
-    ?assertMatch({ok, _}, emqx_plugins:load_plugin(#plugin{name = normal}, true)),
+    ?assertMatch(ok, emqx_plugins:load_plugin(#plugin{name = normal}, true)),
     ?assertMatch({error,_}, emqx_plugins:load_plugin(#plugin{name = error_app}, true)),
 
     ok = meck:unload(application).