This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch feat/conf in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 83d911233a7ecc62f4e9098f7ac8444812ee05e5 Author: Jan Lehnardt <[email protected]> AuthorDate: Thu Sep 13 15:15:08 2018 +0200 remove config: [daemons] --- rel/overlay/etc/default.ini | 10 ---------- src/couch/src/couch_secondary_sup.erl | 13 ++++++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 7ac46a0..ef670d1 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -281,16 +281,6 @@ os_process_limit = 100 ; "infinity" is also a valid configuration value. ;group_info_timeout = 5000 -[daemons] -index_server={couch_index_server, start_link, []} -query_servers={couch_proc_manager, start_link, []} -vhosts={couch_httpd_vhost, start_link, []} -httpd={couch_httpd, start_link, []} -uuids={couch_uuids, start, []} -auth_cache={couch_auth_cache, start_link, []} -os_daemons={couch_os_daemons, start_link, []} -compaction_daemon={couch_compaction_daemon, start_link, []} - [mango] ; Set to true to disable the "index all fields" text index, which can lead ; to out of memory issues when users have documents with nested array fields. diff --git a/src/couch/src/couch_secondary_sup.erl b/src/couch/src/couch_secondary_sup.erl index 0c3b7aa..cfbce6a 100644 --- a/src/couch/src/couch_secondary_sup.erl +++ b/src/couch/src/couch_secondary_sup.erl @@ -26,6 +26,17 @@ init([]) -> worker, dynamic} ], + Daemons = [ + {"index_server", "{couch_index_server, start_link, []}"}, + {"query_servers", "{couch_proc_manager, start_link, []}"}, + {"vhosts", "{couch_httpd_vhost, start_link, []}"}, + {"httpd", "{couch_httpd, start_link, []}"}, + {"uuids", "{couch_uuids, start, []}"}, + {"auth_cache", "{couch_auth_cache, start_link, []}"}, + {"os_daemons", "{couch_os_daemons, start_link, []}"}, + {"compaction_daemon", "{couch_compaction_daemon, start_link, []}"} + ], + Children = SecondarySupervisors ++ [ begin {ok, {Module, Fun, Args}} = couch_util:parse_term(SpecStr), @@ -38,6 +49,6 @@ init([]) -> [Module]} end || {Name, SpecStr} - <- config:get("daemons"), SpecStr /= ""], + <- Daemons, SpecStr /= ""], {ok, {{one_for_one, 50, 3600}, couch_epi:register_service(couch_db_epi, Children)}}.
