summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-11-11 12:02:32 +0000
committerMatthew Sackman <matthew@rabbitmq.com>2010-11-11 12:02:32 +0000
commit624ab591b3c0d08244b59ec6cee35b78d7ed6e33 (patch)
tree6474311506db3e00611b7f6da19205340bb5fc4d
parentd4426ec85bba84c87c9b21d1703b612e08d24ab3 (diff)
downloadrabbitmq-server-624ab591b3c0d08244b59ec6cee35b78d7ed6e33.tar.gz
Cosmetics
-rw-r--r--src/rabbit_mnesia.erl26
1 files changed, 11 insertions, 15 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 340b785b..9d172269 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -250,12 +250,12 @@ ensure_mnesia_dir() ->
ensure_mnesia_running() ->
case mnesia:system_info(is_running) of
yes -> ok;
- no -> throw({error, mnesia_not_running})
+ no -> throw({error, mnesia_not_running})
end.
ensure_mnesia_not_running() ->
case mnesia:system_info(is_running) of
- no -> ok;
+ no -> ok;
yes -> throw({error, mnesia_unexpectedly_running})
end.
@@ -430,19 +430,15 @@ schema_ok_or_move() ->
ok = create_schema()
end.
-version_ok_or_exit(V) ->
- DesiredVersion = rabbit_upgrade:desired_version(),
- case V of
- {ok, DiscVersion} ->
- case DesiredVersion of
- DiscVersion ->
- ok;
- _ ->
- exit({schema_mismatch, DesiredVersion, DiscVersion})
- end;
- {error, _} ->
- ok = rabbit_upgrade:write_version()
- end.
+version_ok_or_exit({ok, DiscVersion}) ->
+ case rabbit_upgrade:desired_version() of
+ DiscVersion ->
+ ok;
+ DesiredVersion ->
+ exit({schema_mismatch, DesiredVersion, DiscVersion})
+ end;
+version_ok_or_exit({error, _}) ->
+ ok = rabbit_upgrade:write_version().
schema_ok_or_exit() ->
case check_schema_integrity() of