diff options
| author | Jan Lehnardt <jan@apache.org> | 2018-09-13 15:15:08 +0200 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2018-11-09 14:51:33 +0100 |
| commit | 21368b7449bd9276b5450838f13758de342e9df6 (patch) | |
| tree | f0d95c8da60da47f05472561a1202a483192e923 | |
| parent | bed99b99ce54946c519eb6315506b74e0b6b0f93 (diff) | |
| download | couchdb-21368b7449bd9276b5450838f13758de342e9df6.tar.gz | |
remove config: [daemons]
| -rw-r--r-- | rel/overlay/etc/default.ini | 10 | ||||
| -rw-r--r-- | 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 73dd947bd..215d7eabe 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 0c3b7aa5a..cfbce6a9a 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)}}. |