diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-02-22 14:13:45 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-02-22 14:13:45 +0000 |
| commit | 587dc8810fc2cc68572dafc53024c9f267b0ebe7 (patch) | |
| tree | 1febd0a4748b72bc597d5a481ee0f6384bf78477 | |
| parent | 242a3e8b52a4c873545826e0abb9ac8fad8af903 (diff) | |
| download | rabbitmq-server-587dc8810fc2cc68572dafc53024c9f267b0ebe7.tar.gz | |
remove redundant function
| -rw-r--r-- | src/rabbit_mnesia.erl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index a9b4e177..74fde4a2 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -371,7 +371,7 @@ init_db(ClusterNodes, Force) -> %% True single disc node, attempt upgrade ok = wait_for_tables(), case rabbit_upgrade:maybe_upgrade() of - ok -> ensure_schema_ok(); + ok -> ensure_schema_integrity(); version_not_available -> schema_ok_or_move() end; {[], true, _} -> @@ -379,7 +379,7 @@ init_db(ClusterNodes, Force) -> %% verify schema ok = wait_for_tables(), ensure_version_ok(rabbit_upgrade:read_version()), - ensure_schema_ok(); + ensure_schema_integrity(); {[], false, _} -> %% Nothing there at all, start from scratch ok = create_schema(); @@ -396,7 +396,7 @@ init_db(ClusterNodes, Force) -> true -> disc; false -> ram end), - ensure_schema_ok() + ensure_schema_integrity() end; {error, Reason} -> %% one reason we may end up here is if we try to join @@ -429,12 +429,6 @@ ensure_version_ok({ok, DiscVersion}) -> ensure_version_ok({error, _}) -> ok = rabbit_upgrade:write_version(). -ensure_schema_ok() -> - case check_schema_integrity() of - ok -> ok; - {error, Reason} -> throw({error, {schema_invalid, Reason}}) - end. - create_schema() -> mnesia:stop(), rabbit_misc:ensure_ok(mnesia:create_schema([node()]), |