diff options
| author | Simon MacMullen <simon@lshift.net> | 2008-12-01 15:55:28 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2008-12-01 15:55:28 +0000 |
| commit | e955a27cf0cc58ad3e133f84971e45efe7f9fd43 (patch) | |
| tree | 30e4d5601de8b625d49a485460f67c803295d22d /src | |
| parent | dc21e5ea5ee0ad7f17388ae0b978e5ba62ad5648 (diff) | |
| download | rabbitmq-server-git-e955a27cf0cc58ad3e133f84971e45efe7f9fd43.tar.gz | |
Invert the case of all this - check that the schema is current rather
than an update is needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 91c8e47723..61d40983a7 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -30,8 +30,8 @@ -export([table_names/0]). -%% Called by rabbit-mnesia-update-needed script --export([update_needed/0]). +%% Called by rabbit-mnesia-current script +-export([schema_current/0]). %% create_tables/0 exported for helping embed RabbitMQ in or alongside %% other mnesia-using Erlang applications, such as ejabberd @@ -51,7 +51,7 @@ -spec(reset/0 :: () -> 'ok'). -spec(force_reset/0 :: () -> 'ok'). -spec(create_tables/0 :: () -> 'ok'). --spec(update_needed/0 :: () -> bool()). +-spec(schema_current/0 :: () -> bool()). -endif. @@ -95,19 +95,18 @@ cluster(ClusterNodes) -> reset() -> reset(false). force_reset() -> reset(true). -%% This is invoked by rabbitmq-mnesia-update-needed. It will halt with an error -%% code if an update is needed, and halt without one otherwise. -update_needed() -> +%% This is invoked by rabbitmq-mnesia-current. +schema_current() -> application:start(mnesia), ok = ensure_mnesia_running(), ok = ensure_mnesia_dir(), ok = init_db(read_cluster_nodes_config()), try ensure_schema_integrity(), - false + true catch {error, {schema_integrity_check_failed, _Reason}} -> - true + false end. %%-------------------------------------------------------------------- |