summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-09-17 15:51:34 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-09-17 15:51:34 +0100
commitdbaa11b6f0a30c42b611cb99fd1d061a2cbe01c2 (patch)
treeeef87d46daa02f7447918951a40ae113bf69f0a5
parenta96ea0968abebe54ff3831dd705f0f1d4db2465b (diff)
downloadrabbitmq-server-git-dbaa11b6f0a30c42b611cb99fd1d061a2cbe01c2.tar.gz
If there are enabled-but-missing plugins, don't fail activation; we don't fail to boot here so live activation should be OK too. The command line tool will have warned the user.
-rw-r--r--src/rabbit_plugins.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl
index 04db5d5d21..84a0d022e6 100644
--- a/src/rabbit_plugins.erl
+++ b/src/rabbit_plugins.erl
@@ -41,10 +41,8 @@ ensure(FileJustChanged) ->
{ok, OurFile} = application:get_env(rabbit, enabled_plugins_file),
case OurFile of
FileJustChanged ->
- {ok, Dir} = application:get_env(rabbit, plugins_dir),
Enabled = read_enabled(OurFile),
- Wanted = dependencies(false, Enabled, list(Dir)),
- prepare_plugins(Enabled),
+ Wanted = prepare_plugins(Enabled),
Current = active(),
Start = Wanted -- Current,
Stop = Current -- Wanted,