diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-12 15:49:14 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-12 15:49:14 +0000 |
| commit | 03ee535c4fccb9b895289a352ab335624b9cb662 (patch) | |
| tree | 5e25daba9e4c6a2a51d683a24a3483cb24da3dcf /src | |
| parent | c13ff742a541433ae3cdd86c75f3ba50b1877ff7 (diff) | |
| parent | f416f2152942177494d7431f6123034fc427a9f3 (diff) | |
| download | rabbitmq-server-git-03ee535c4fccb9b895289a352ab335624b9cb662.tar.gz | |
merge default into bug23498
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 22 | ||||
| -rw-r--r-- | src/rabbit_upgrade.erl | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 331ad12054..3b41237ab0 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -361,16 +361,15 @@ init_db(ClusterNodes, Force) -> case mnesia:change_config(extra_db_nodes, ProperClusterNodes) of {ok, Nodes} -> case Force of - false -> - FailedClusterNodes = ProperClusterNodes -- Nodes, - case FailedClusterNodes of - [] -> ok; - _ -> - throw({error, {failed_to_cluster_with, - FailedClusterNodes, - "Mnesia could not connect to some nodes."}}) - end; - _ -> ok + false -> FailedClusterNodes = ProperClusterNodes -- Nodes, + case FailedClusterNodes of + [] -> ok; + _ -> throw({error, {failed_to_cluster_with, + FailedClusterNodes, + "Mnesia could not connect " + "to some nodes."}}) + end; + true -> ok end, case {Nodes, mnesia:system_info(use_dir), mnesia:system_info(db_nodes)} of @@ -413,8 +412,7 @@ init_db(ClusterNodes, Force) -> %% one reason we may end up here is if we try to join %% nodes together that are currently running standalone or %% are members of a different cluster - throw({error, {unable_to_join_cluster, - ClusterNodes, Reason}}) + throw({error, {unable_to_join_cluster, ClusterNodes, Reason}}) end. schema_ok_or_move() -> diff --git a/src/rabbit_upgrade.erl b/src/rabbit_upgrade.erl index ba06ade82c..f4016d818a 100644 --- a/src/rabbit_upgrade.erl +++ b/src/rabbit_upgrade.erl @@ -67,8 +67,8 @@ maybe_upgrade() -> read_version() -> case rabbit_misc:read_term_file(schema_filename()) of - {ok, [Heads]} -> {ok, Heads}; - {error, E} -> {error, E} + {ok, [Heads]} -> {ok, Heads}; + {error, _E} = Err -> Err end. write_version() -> |