diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-11-08 16:20:26 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-11-08 16:20:26 +0000 |
| commit | 6c341072bf67f3776389f5564937686c20830611 (patch) | |
| tree | 4d83ae10112d6181127caf232ad90cd7f24705fe /src/rabbit.erl | |
| parent | 86bad8fd00201ee7b0e3ba2ccc59382f4ae86d35 (diff) | |
| download | rabbitmq-server-git-6c341072bf67f3776389f5564937686c20830611.tar.gz | |
Make the app marker into a gen_server
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 8c13224fc4..66adcca3c6 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -21,7 +21,7 @@ -export([start/0, boot/0, stop/0, stop_and_halt/0, await_startup/0, status/0, is_running/0, is_running/1, environment/0, rotate_logs/1, force_event_refresh/0, - start_fhc/0, start_app_marker/1, hibernate/0]). + start_fhc/0]). -export([start/2, stop/1]). @@ -176,7 +176,8 @@ -rabbit_boot_step({app_running, [{description, "cluster membership"}, - {mfa, {rabbit, start_app_marker, [boot]}}, + {mfa, {rabbit_sup, start_restartable_child, + [rabbit_app_marker]}}, {requires, networking}]}). -rabbit_boot_step({notify_cluster, @@ -775,16 +776,3 @@ start_fhc() -> rabbit_sup:start_restartable_child( file_handle_cache, [fun rabbit_alarm:set_alarm/1, fun rabbit_alarm:clear_alarm/1]). - -start_app_marker(boot) -> - supervisor:start_child(rabbit_sup, - {rabbit_app, {?MODULE, start_app_marker, [spawn]}, - transient, ?MAX_WAIT, worker, [?MODULE]}); -start_app_marker(spawn) -> - Pid = spawn_link(fun() -> erlang:hibernate(?MODULE, hibernate, []) end), - register(rabbit_running, Pid), - {ok, Pid}. - -hibernate() -> - erlang:hibernate(?MODULE, hibernate, []). - |