diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-06 12:30:15 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-06 12:30:15 +0100 |
| commit | 069d5a7a5b12b86c14d5c3da23d684b3ae9c1a6b (patch) | |
| tree | f1a2922257e31e609c76e827f622e544470d0ff8 | |
| parent | f4f473d01e3feb3c8b9b37006738798c88c671e1 (diff) | |
| download | rabbitmq-server-bug23083.tar.gz | |
tweakbug23083
| -rw-r--r-- | src/rabbit_mnesia.erl | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index b575540d..505dc28f 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -235,21 +235,21 @@ ensure_mnesia_not_running() -> check_schema_integrity() -> TabDefs = table_definitions(), Tables = mnesia:system_info(tables), - case [Failure || Tab <- table_names(), - case lists:member(Tab, Tables) of - false -> - Failure = {table_missing, Tab}, - true; - true -> - {_, TabDef} = proplists:lookup(Tab, TabDefs), - {_, EAttrs} = proplists:lookup(attributes, TabDef), - Attrs = mnesia:table_info(Tab, attributes), - Failure = {table_attributes_mismatch, Tab, - EAttrs, Attrs}, - Attrs /= EAttrs - end] of - [] -> ok; - Ps -> {error, Ps} + case [Error || Tab <- table_names(), + case lists:member(Tab, Tables) of + false -> + Error = {table_missing, Tab}, + true; + true -> + {_, TabDef} = proplists:lookup(Tab, TabDefs), + {_, ExpAttrs} = proplists:lookup(attributes, TabDef), + Attrs = mnesia:table_info(Tab, attributes), + Error = {table_attributes_mismatch, Tab, + ExpAttrs, Attrs}, + Attrs /= ExpAttrs + end] of + [] -> ok; + Errors -> {error, Errors} end. %% The cluster node config file contains some or all of the disk nodes |