summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-12-05 12:18:10 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-12-05 12:18:10 +0000
commit3a330c4bff99243a53e20aa041a18836e5f6574c (patch)
tree9b9e62866776c17f592b6ffded7abc2f3ef43a62
parentf106429bc42ff46944790acc0a8c917db9ff9405 (diff)
parentbca1e2ea0903c8ce1c130a08a16f86eff5fb0e44 (diff)
downloadrabbitmq-server-3a330c4bff99243a53e20aa041a18836e5f6574c.tar.gz
Merge bug26446
-rw-r--r--src/rabbit_plugins.erl22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl
index dfde5289..55f7359b 100644
--- a/src/rabbit_plugins.erl
+++ b/src/rabbit_plugins.erl
@@ -208,7 +208,27 @@ clean_plugin(Plugin, ExpandDir) ->
delete_recursively(rabbit_misc:format("~s/~s", [ExpandDir, Plugin])).
prepare_dir_plugin(PluginAppDescPath) ->
- code:add_patha(filename:dirname(PluginAppDescPath)).
+ PluginEbinDir = filename:dirname(PluginAppDescPath),
+ Plugin = filename:basename(PluginAppDescPath, ".app"),
+ code:add_patha(PluginEbinDir),
+ case filelib:wildcard(PluginEbinDir++ "/*.beam") of
+ [] ->
+ ok;
+ [BeamPath | _] ->
+ Module = list_to_atom(filename:basename(BeamPath, ".beam")),
+ case code:ensure_loaded(Module) of
+ {module, _} ->
+ ok;
+ {error, badfile} ->
+ rabbit_log:error("Failed to enable plugin \"~s\": "
+ "it may have been built with an "
+ "incompatible (more recent?) "
+ "version of Erlang~n", [Plugin]),
+ throw({plugin_built_with_incompatible_erlang, Plugin});
+ Error ->
+ throw({plugin_module_unloadable, Plugin, Error})
+ end
+ end.
%%----------------------------------------------------------------------------