diff options
author | Matthias Radestock <matthias@lshift.net> | 2009-08-20 02:42:32 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@lshift.net> | 2009-08-20 02:42:32 +0100 |
commit | 05270ad59cfbabdbd7b9a1b8587b9d69bbc2cc78 (patch) | |
tree | 72fbce9d9bc5658ac6c81292ad42d554b6f8dfc3 | |
parent | a209602667cf817a965c686e2a58c4907f07ebc5 (diff) | |
download | rabbitmq-server-05270ad59cfbabdbd7b9a1b8587b9d69bbc2cc78.tar.gz |
some cleaning up
mainly remove the (now) badly named WasDiskNode var
-rw-r--r-- | src/rabbit_mnesia.erl | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index e90ef923..82a8fde1 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -263,13 +263,9 @@ delete_cluster_nodes_config() -> %% standalone disk node, or disk or ram node connected to the %% specified cluster nodes. init_db(ClusterNodes) -> - WasDiskNode = mnesia:system_info(use_dir), - IsDiskNode = ClusterNodes == [] orelse - lists:member(node(), ClusterNodes), - ExtraNodes = ClusterNodes -- [node()], - case mnesia:change_config(extra_db_nodes, ExtraNodes) of + case mnesia:change_config(extra_db_nodes, ClusterNodes -- [node()]) of {ok, []} -> - case WasDiskNode of + case mnesia:system_info(use_dir) of true -> case check_schema_integrity() of ok -> @@ -289,14 +285,15 @@ init_db(ClusterNodes) -> ok = create_schema() end; {ok, [_|_]} -> - TableCopyType = case IsDiskNode of - true -> disc; - false -> ram - end, + IsDiskNode = ClusterNodes == [] orelse + lists:member(node(), ClusterNodes), ok = wait_for_replicated_tables(), ok = create_local_table_copy(schema, disc_copies), ok = create_local_non_replicated_table_copies(disc), - ok = create_local_replicated_table_copies(TableCopyType); + ok = create_local_replicated_table_copies(case IsDiskNode of + true -> disc; + false -> ram + end); {error, Reason} -> %% one reason we may end up here is if we try to join %% nodes together that are currently running standalone or |