diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-01-04 16:12:07 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-01-04 16:12:07 +0000 |
| commit | a2ef8678d7c52e45032b7b3b604f9c4a03b64d45 (patch) | |
| tree | ba2547f7b3e0823db8f3e691ac5d75b3231cda1c /src | |
| parent | 02800055c4cec47a23afba8ff5e3de8928e6f4dd (diff) | |
| download | rabbitmq-server-git-a2ef8678d7c52e45032b7b3b604f9c4a03b64d45.tar.gz | |
Revert arbitrary difference from default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index e5929f86b6..d8086b567a 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -404,11 +404,8 @@ init_db(ClusterNodes, Force) -> %% ensure_version_ok(rabbit_upgrade:read_version()), %% ensure_version_ok( %% rpc:call(AnotherNode, rabbit_upgrade, read_version, [])), - Type = case ClusterNodes == [] orelse - lists:member(node(), ClusterNodes) of - true -> disc; - false -> ram - end, + IsDiskNode = ClusterNodes == [] orelse + lists:member(node(), ClusterNodes), case rabbit_upgrade:maybe_upgrade( [local], reset_fun(ProperClusterNodes)) of ok -> @@ -420,7 +417,10 @@ init_db(ClusterNodes, Force) -> end, ok = wait_for_replicated_tables(), ok = create_local_table_copy(schema, disc_copies), - ok = create_local_table_copies(Type), + ok = create_local_table_copies(case IsDiskNode of + true -> disc; + false -> ram + end), ensure_schema_ok() end; {error, Reason} -> |