diff options
author | Jan Lehnardt <jan@apache.org> | 2020-02-19 21:55:55 +0100 |
---|---|---|
committer | Joan Touzet <wohali@users.noreply.github.com> | 2020-02-20 00:01:32 +0000 |
commit | 72ce32e4349a5b19d1839547715316e030d51221 (patch) | |
tree | 9d485a1e11fb4f1bde8872a0709e46313be23862 | |
parent | 5f6a76de87a77a612f8f124ba302bb86682eb5d4 (diff) | |
download | couchdb-72ce32e4349a5b19d1839547715316e030d51221.tar.gz |
Revert "fix: single node state (#2574)"
This reverts commit afef1b2f5823f6269ecb4a845e286e9d0c0f4f35.
-rw-r--r-- | src/setup/src/setup.erl | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl index cc64ae438..3d23229b8 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() -> |