add finish cluster routine
diff --git a/src/setup.erl b/src/setup.erl
index e5afb2a..781691e 100644
--- a/src/setup.erl
+++ b/src/setup.erl
@@ -46,12 +46,12 @@
has_cluster_system_dbs() ->
% GET /_users /_replicator /_cassim
- Users = fabric:get_db_info("_users"),
- Replicator = fabric:get_db_info("_replicator"),
- Cassim = fabric:get_db_info("_cassim"),
- case {Users, Replicator, Cassim} of
+ case catch {
+ fabric:get_db_info("_users"),
+ fabric:get_db_info("_replicator"),
+ fabric:get_db_info("_cassim")} of
{{ok, _}, {ok, _}, {ok, _}} -> ok;
- _Else -> no
+ _ -> no
end.
enable_cluster(Options) ->
@@ -101,12 +101,12 @@
finish_cluster() ->
finish_cluster_int(has_cluster_system_dbs()).
-finish_cluster_int(no) ->
- {error, cluster_finished};
finish_cluster_int(ok) ->
- io:format("~nFinish Cluster~n").
+ {error, cluster_finished};
+finish_cluster_int(no) ->
% create clustered databases (_users, _replicator, _cassim/_metadata
- % am I in enabled mode, are there nodes?
+ Databases = ["_users", "_replicator", "_cassim"],
+ lists:foreach(fun fabric:create_db/1, Databases).
add_node(Options) ->
diff --git a/src/setup_httpd.erl b/src/setup_httpd.erl
index 550b04a..755b951 100644
--- a/src/setup_httpd.erl
+++ b/src/setup_httpd.erl
@@ -52,11 +52,13 @@
handle_action("finish_cluster", Setup) ->
- io:format("~nfinish_cluster: ~p~n", [Setup]),
- case etup:finish_cluster() of
+ io:format("~nffinish_cluster: ~p~n", [Setup]),
+ case setup:finish_cluster() of
{error, cluster_finished} ->
{error, <<"Cluster is already finished">>};
- _ -> ok
+ Else ->
+ io:format("~nElse: ~p~n", [Else]),
+ ok
end;
handle_action("add_node", Setup) ->
