diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 14:43:32 +0000 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-12 14:43:32 +0000 |
commit | 90d3914c6aab0b510c42000d00615d5c51ec4345 (patch) | |
tree | d0a10497f41da23bf6ca11a4961cd0530a423bb0 /src | |
parent | e45219e2eea0ef94646518a122dedf6f39fadc2f (diff) | |
download | rabbitmq-server-90d3914c6aab0b510c42000d00615d5c51ec4345.tar.gz |
Cosmetic.
Diffstat (limited to 'src')
-rw-r--r-- | src/rabbit_mnesia.erl | 3 | ||||
-rw-r--r-- | src/rabbit_upgrade.erl | 34 |
2 files changed, 16 insertions, 21 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 6523a036..ee6ede35 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -408,7 +408,8 @@ init_db(ClusterNodes, Force) -> false -> ram end), case rabbit_upgrade:maybe_upgrade(local) of - ok -> ok; + ok -> + ok; %% If we're just starting up a new node we won't have %% a version version_not_available -> diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index 53ed99d3..6df881fd 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -63,13 +63,10 @@ maybe_upgrade_mnesia() -> ok; version_not_available -> case Nodes of - [_] -> - ok; - _ -> - die("Cluster upgrade needed but upgrading from < 2.1.1.~n" - " Unfortunately you will need to rebuild the " - "cluster.", - []) + [_] -> ok; + _ -> die("Cluster upgrade needed but upgrading from " + "< 2.1.1.~n Unfortunately you will need to " + "rebuild the cluster.", []) end end. @@ -78,11 +75,10 @@ am_i_upgrader(Nodes) -> case Running of [] -> case am_i_disc_node() of - true -> - true; - false -> - die("Cluster upgrade needed but this is a ram node.~n " - "Please start any of the disc nodes first.", []) + true -> true; + false -> die("Cluster upgrade needed but this is a ram " + "node.~n Please start any of the disc nodes " + "first.", []) end; [Another|_] -> ClusterVersion = @@ -100,8 +96,8 @@ am_i_upgrader(Nodes) -> MyVersion -> %% The other node(s) are running an unexpected version. die("Cluster upgrade needed but other nodes are " - "running ~p~n" - "and I want ~p", [ClusterVersion, MyVersion]) + "running ~p~nand I want ~p", + [ClusterVersion, MyVersion]) end end. @@ -131,12 +127,10 @@ primary_upgrade(Upgrades, Nodes) -> rabbit_misc:ensure_ok(mnesia:start(), cannot_start_mnesia), force_tables(), case Others of - [] -> - ok; - _ -> - info("mnesia upgrades: Breaking cluster~n", []), - [{atomic, ok} = mnesia:del_table_copy(schema, Node) - || Node <- Others] + [] -> ok; + _ -> info("mnesia upgrades: Breaking cluster~n", []), + [{atomic, ok} = mnesia:del_table_copy(schema, Node) + || Node <- Others] end end), ok. |