diff options
| author | Tim Watson <watson.timothy@gmail.com> | 2014-03-17 15:58:47 +0000 |
|---|---|---|
| committer | Tim Watson <watson.timothy@gmail.com> | 2014-03-17 15:58:47 +0000 |
| commit | 3de081adf60d9348f73b3401e81b1570a2419c2e (patch) | |
| tree | e12c530e036c9000c0b322bfcdfaf491ce711ed1 /src/rabbit.erl | |
| parent | ce5374586fe10aea98d5e0bbc56827b651021703 (diff) | |
| download | rabbitmq-server-3de081adf60d9348f73b3401e81b1570a2419c2e.tar.gz | |
Inline app_utils:update_running_apps/2
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 062b9355..3d043b50 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -312,7 +312,7 @@ start() -> ok = ensure_working_log_handlers(), rabbit_node_monitor:prepare_cluster_status_files(), rabbit_mnesia:check_cluster_consistency(), - ok = start_apps(app_startup_order()), + start_apps(app_startup_order()), ok = log_broker_started(rabbit_plugins:active()) end). @@ -330,7 +330,7 @@ boot() -> rabbit_mnesia:check_cluster_consistency(), Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, - ok = start_apps(ToBeLoaded), + start_apps(ToBeLoaded), ok = log_broker_started(Plugins) end). @@ -349,7 +349,8 @@ start_apps(Apps) -> _ -> ok end, ok = app_utils:start_applications(StartupApps, - handle_app_error(could_not_start)). + handle_app_error(could_not_start)), + StartupApps. start_it(StartFun) -> Marker = spawn_link(fun() -> receive stop -> ok end end), |