You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2020/02/19 20:54:52 UTC

[couchdb] 01/02: Revert "fix: single node state (#2575)"

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch fix/single-node-status
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 5102ab840658bc2bcd5a168ba0c80a4aa3072524
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Wed Feb 19 21:51:52 2020 +0100

    Revert "fix: single node state (#2575)"
    
    This reverts commit 91ecf6777cc5fff93483b8e92c8daadd7ff33fdc.
---
 src/setup/src/setup.erl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl
index cc64ae4..3d23229 100644
--- a/src/setup/src/setup.erl
+++ b/src/setup/src/setup.erl
@@ -65,15 +65,13 @@ is_cluster_enabled() ->
     end.
 
 is_single_node_enabled(Dbs) ->
-    % admins != empty AND dbs exist OR `[couchdb] single_node` is set to true
+    % admins != empty AND dbs exist
     Admins = config:get("admins"),
     HasDbs = has_cluster_system_dbs(Dbs),
-    SingleNodeConfig = config:get_boolean("couchdb", "single_node", false),
-    case {Admins, HasDbs, SingleNodeConfig} of
-        {_, _, true} -> true;
-        {[], _, _} -> false;
-        {_, false, _} -> false;
-        {_,_,_} -> true
+    case {Admins, HasDbs} of
+        {[], _} -> false;
+        {_, false} -> false;
+        {_,_} -> true
     end.
 
 cluster_system_dbs() ->