summaryrefslogtreecommitdiff
path: root/src/rabbit_upgrade.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-01-12 14:43:32 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-01-12 14:43:32 +0000
commit90d3914c6aab0b510c42000d00615d5c51ec4345 (patch)
treed0a10497f41da23bf6ca11a4961cd0530a423bb0 /src/rabbit_upgrade.erl
parente45219e2eea0ef94646518a122dedf6f39fadc2f (diff)
downloadrabbitmq-server-90d3914c6aab0b510c42000d00615d5c51ec4345.tar.gz
Cosmetic.
Diffstat (limited to 'src/rabbit_upgrade.erl')
-rw-r--r--src/rabbit_upgrade.erl34
1 files changed, 14 insertions, 20 deletions
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.