diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-07-03 15:32:15 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-07-03 15:32:15 +0100 |
| commit | 109b9628f404a00139d4fb19d47dea7f268d3151 (patch) | |
| tree | 73e216c4ddbf37856978ec3a15c4d34a9ea2b1fa /src | |
| parent | 808473257bb974f394e8b940d3ae9859f892fe76 (diff) | |
| download | rabbitmq-server-git-109b9628f404a00139d4fb19d47dea7f268d3151.tar.gz | |
Only force load if the app is actually down.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 6ba4009ae8..5a22338b82 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -308,7 +308,10 @@ action(forget_cluster_node, Node, [ClusterNodeS], Opts, Inform) -> action(force_boot, _Node, [], _Opts, Inform) -> Inform("Forcing boot for Mnesia dir ~s", [mnesia:system_info(directory)]), - rabbit_mnesia:force_load_next_boot(); + case rabbit:is_running(Node) of + false -> rabbit_mnesia:force_load_next_boot(); + true -> {error, rabbit_running} + end; action(sync_queue, Node, [Q], Opts, Inform) -> VHost = proplists:get_value(?VHOST_OPT, Opts), |