diff options
| author | Tim Watson <tim@rabbitmq.com> | 2014-03-04 14:02:59 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2014-03-04 14:02:59 +0000 |
| commit | 2ac7c1b4abb4b7e27dd5289387a78d3d4dff6885 (patch) | |
| tree | aa69562d837465fd66cda88f0630461a2083125f /src | |
| parent | bb17a6e526b7bc179d22483e9b436b4a79e5dda4 (diff) | |
| download | rabbitmq-server-git-2ac7c1b4abb4b7e27dd5289387a78d3d4dff6885.tar.gz | |
Fix an oops in rabbit:stop/0 and apply consistent parameter names in r_plugins
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_plugins.erl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 9644f75eb1..82394cd9a3 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -377,7 +377,7 @@ start_it(StartFun) -> stop() -> Apps = app_shutdown_order(), - case whereis(?MODULE) of + case whereis(rabbit_boot) of undefined -> ok; _ -> app_utils:wait_for_applications(Apps) end, diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index e15ae0b182..6572a625bd 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -38,10 +38,10 @@ %%---------------------------------------------------------------------------- -enable(Enabled) -> - prepare_plugins(Enabled), +enable(Plugins) -> + prepare_plugins(Plugins), app_utils:update_running_apps( - fun() -> rabbit:start_apps(Enabled) end, + fun() -> rabbit:start_apps(Plugins) end, fun(Diff) -> ok = rabbit_event:notify(plugins_changed, [{enabled, Diff}]) end). |