summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2008-11-27 16:35:44 +0000
committerSimon MacMullen <simon@lshift.net>2008-11-27 16:35:44 +0000
commite5a65accb4c54c6a2671dae7eeb15a00c3a988d5 (patch)
tree7c06c95d2b40318f1c830aaf61a7604d8434aa82 /src
parentbd00b2c6aa5839d739c8ee3871c8bd3f3d1d4137 (diff)
downloadrabbitmq-server-git-e5a65accb4c54c6a2671dae7eeb15a00c3a988d5.tar.gz
It's nicer if update_needed is just a function, not something that
halts!
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mnesia.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 140574b5db..91c8e47723 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -51,7 +51,7 @@
-spec(reset/0 :: () -> 'ok').
-spec(force_reset/0 :: () -> 'ok').
-spec(create_tables/0 :: () -> 'ok').
--spec(update_needed/0 :: () -> 'halt').
+-spec(update_needed/0 :: () -> bool()).
-endif.
@@ -102,12 +102,13 @@ update_needed() ->
ok = ensure_mnesia_running(),
ok = ensure_mnesia_dir(),
ok = init_db(read_cluster_nodes_config()),
- try ensure_schema_integrity()
+ try
+ ensure_schema_integrity(),
+ false
catch
{error, {schema_integrity_check_failed, _Reason}} ->
- halt(1)
- end,
- halt().
+ true
+ end.
%%--------------------------------------------------------------------