diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-01 14:07:50 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-01 14:07:50 +0000 |
commit | 28afc69c35fcb9663a4a4d19e1be5c0080ec97bf (patch) | |
tree | b8a117705c74ab37f2964be3f7cb9a1fc1029900 | |
parent | f95ca88d8f4feb13acb92adfffd525a1c086b14c (diff) | |
download | rabbitmq-server-28afc69c35fcb9663a4a4d19e1be5c0080ec97bf.tar.gz |
Inline.
-rw-r--r-- | src/rabbit_mnesia.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 802f5a25..cfa8f237 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -500,7 +500,16 @@ delete_previously_running_nodes() -> end. init_db(ClusterNodes, Force) -> - init_db(ClusterNodes, Force, fun maybe_upgrade_local_or_record_desired/0). + init_db( + ClusterNodes, Force, + fun () -> + case rabbit_upgrade:maybe_upgrade_local() of + ok -> ok; + %% If we're just starting up a new node we won't have a + %% version + version_not_available -> ok = rabbit_version:record_desired() + end + end). %% Take a cluster node config and create the right kind of node - a %% standalone disk node, or disk or ram node connected to the @@ -569,14 +578,6 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) -> throw({error, {unable_to_join_cluster, ClusterNodes, Reason}}) end. -maybe_upgrade_local_or_record_desired() -> - case rabbit_upgrade:maybe_upgrade_local() of - ok -> ok; - %% If we're just starting up a new node we won't have a - %% version - version_not_available -> ok = rabbit_version:record_desired() - end. - schema_ok_or_move() -> case check_schema_integrity() of ok -> |