diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-22 16:16:17 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-22 16:16:17 +0000 |
| commit | 81885ac7b8aa09e105ba9f1c977f49fa69c9af7a (patch) | |
| tree | c19a2aff7137b95b26a55e35136e790b051f4bab /src | |
| parent | 307f6acb13c24ca4314c54ecfb2db63e0e0df6bd (diff) | |
| download | rabbitmq-server-git-81885ac7b8aa09e105ba9f1c977f49fa69c9af7a.tar.gz | |
Application unload on plugins schemas extract
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugins.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 1c1f478f6f..2f084ed28a 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -83,7 +83,7 @@ setup() -> prepare_plugins(Enabled). extract_schemas(SchemaDir) -> - Loaded = ok == application:load(rabbit), + application:load(rabbit), {ok, EnabledFile} = application:get_env(rabbit, enabled_plugins_file), Enabled = read_enabled(EnabledFile), @@ -92,12 +92,9 @@ extract_schemas(SchemaDir) -> AllPlugins = list(PluginsDistDir), Wanted = dependencies(false, Enabled, AllPlugins), WantedPlugins = lookup_plugins(Wanted, AllPlugins), - io:format("Extracting schema for ~p~n", [Wanted]), [ extract_schema(Plugin, SchemaDir) || Plugin <- WantedPlugins ], - case Loaded of - true -> ok; - false -> application:unload(rabbit) - end. + application:unload(rabbit), + ok. extract_schema(#plugin{type = ez, location = Location}, SchemaDir) -> {ok, Files} = zip:extract(Location, |