summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexey Lebedeff <alebedev@mirantis.com>2016-05-10 11:01:37 +0300
committerAlexey Lebedeff <alebedev@mirantis.com>2016-05-10 11:01:37 +0300
commit7f348db0dffb443baf4468aa038d3888819b8132 (patch)
treead5454ddd4c74f959104f4a8d37e3573c400fae1 /src
parentd93efbbe2eb932f6314a1c9b08fae5b60c8f812b (diff)
downloadrabbitmq-server-git-7f348db0dffb443baf4468aa038d3888819b8132.tar.gz
Don't scare ops with empty list of failed plugins
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_plugins.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl
index 8f7319182e..47574a9d55 100644
--- a/src/rabbit_plugins.erl
+++ b/src/rabbit_plugins.erl
@@ -253,8 +253,7 @@ prepare_plugins(Enabled) ->
Wanted = dependencies(false, Enabled, AllPlugins),
WantedPlugins = lookup_plugins(Wanted, AllPlugins),
{ValidPlugins, Problems} = validate_plugins(WantedPlugins),
- %% TODO: error message formatting
- rabbit_log:warning(format_invalid_plugins(Problems)),
+ maybe_warn_about_invalid_plugins(Problems),
case filelib:ensure_dir(ExpandDir ++ "/") of
ok -> ok;
{error, E2} -> throw({error, {cannot_create_plugins_expand_dir,
@@ -266,6 +265,13 @@ prepare_plugins(Enabled) ->
PluginAppDescPath <- filelib:wildcard(ExpandDir ++ "/*/ebin/*.app")],
Wanted.
+maybe_warn_about_invalid_plugins([]) ->
+ ok;
+maybe_warn_about_invalid_plugins(InvalidPlugins) ->
+ %% TODO: error message formatting
+ rabbit_log:warning(format_invalid_plugins(InvalidPlugins)).
+
+
format_invalid_plugins(InvalidPlugins) ->
lists:flatten(["Failed to enable some plugins: \r\n"
| [format_invalid_plugin(Plugin)