Skip to content

Provide some defaults for embedding #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2017
Merged

Provide some defaults for embedding #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce49870
Provide some defaults for embedding
Mar 3, 2017
f6da25c
Add back mnesia dir reset/restore
Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rabbit_mnesia.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,12 +840,12 @@ with_running_or_clean_mnesia(Fun) ->
case IsMnesiaRunning of
true -> Fun();
false ->
{ok, MnesiaDir} = application:get_env(mnesia, dir),
SavedMnesiaDir = dir(),
application:unset_env(mnesia, dir),
mnesia:start(),
Result = Fun(),
application:stop(mnesia),
application:set_env(mnesia, dir, MnesiaDir),
application:set_env(mnesia, dir, SavedMnesiaDir),
Result
end.

Expand Down
41 changes: 32 additions & 9 deletions src/rabbit_plugins.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,49 @@ ensure(FileJustChanged0) ->
{error, {enabled_plugins_mismatch, FileJustChanged, OurFile}}
end.

-spec plugins_expand_dir() -> file:filename().
plugins_expand_dir() ->
case application:get_env(rabbit, plugins_expand_dir) of
{ok, ExpandDir} ->
ExpandDir;
_ ->
filename:join([rabbit_mnesia:dir(), "plugins_expand_dir"])
end.

-spec plugins_dist_dir() -> file:filename().
plugins_dist_dir() ->
case application:get_env(rabbit, plugins_dir) of
{ok, PluginsDistDir} ->
PluginsDistDir;
_ ->
filename:join([rabbit_mnesia:dir(), "fake_plugins_dir"])
end.

-spec enabled_plugins() -> [atom()].
enabled_plugins() ->
case application:get_env(rabbit, enabled_plugins_file) of
{ok, EnabledFile} ->
read_enabled(EnabledFile);
_ ->
[]
end.

%% @doc Prepares the file system and installs all enabled plugins.
setup() ->
{ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir),

ExpandDir = plugins_expand_dir(),
%% Eliminate the contents of the destination directory
case delete_recursively(ExpandDir) of
ok -> ok;
{error, E1} -> throw({error, {cannot_delete_plugins_expand_dir,
[ExpandDir, E1]}})
end,

{ok, EnabledFile} = application:get_env(rabbit, enabled_plugins_file),
Enabled = read_enabled(EnabledFile),
Enabled = enabled_plugins(),
prepare_plugins(Enabled).

%% @doc Lists the plugins which are currently running.
active() ->
{ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir),
InstalledPlugins = plugin_names(list(ExpandDir)),
InstalledPlugins = plugin_names(list(plugins_expand_dir())),
[App || {App, _, _} <- rabbit_misc:which_applications(),
lists:member(App, InstalledPlugins)].

Expand Down Expand Up @@ -163,10 +187,9 @@ is_loadable(App) ->
%%----------------------------------------------------------------------------

prepare_plugins(Enabled) ->
{ok, PluginsDistDir} = application:get_env(rabbit, plugins_dir),
{ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir),
ExpandDir = plugins_expand_dir(),

AllPlugins = list(PluginsDistDir),
AllPlugins = list(plugins_dist_dir()),
Wanted = dependencies(false, Enabled, AllPlugins),
WantedPlugins = lookup_plugins(Wanted, AllPlugins),

Expand Down