summaryrefslogtreecommitdiff
path: root/src/couchdb
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2009-09-12 16:39:24 +0000
committerAdam Kocoloski <kocolosk@apache.org>2009-09-12 16:39:24 +0000
commitc82008d34e656821ff46edfb88075f590ae099b0 (patch)
treeb564ab76f923657cf3e17d41dc5802cc17772787 /src/couchdb
parent45796298231349dadf650e9ddefd7a6ff32e1302 (diff)
bugfixes in supervision tree specifications
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@814189 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
-rw-r--r--src/couchdb/couch_batch_save_sup.erl2
-rw-r--r--src/couchdb/couch_server_sup.erl6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/couchdb/couch_batch_save_sup.erl b/src/couchdb/couch_batch_save_sup.erl
index 0a752525..c18e2c1c 100644
--- a/src/couchdb/couch_batch_save_sup.erl
+++ b/src/couchdb/couch_batch_save_sup.erl
@@ -33,5 +33,5 @@ init([]) ->
"batch_save_interval","1000")),
Batch = {batch, {couch_batch_save, start_link, [BatchSize, BatchInterval]},
- permanent, 1000, worker, [batch_save]},
+ permanent, 1000, worker, [couch_batch_save]},
{ok, {{one_for_one, 10, 3600}, [Batch]}}.
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 1a31c7cc..610a9a61 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -89,7 +89,7 @@ start_server(IniFiles) ->
permanent,
brutal_kill,
worker,
- dynamic},
+ [couch_config]},
{couch_primary_services,
{couch_server_sup, start_primary_services, []},
permanent,
@@ -155,13 +155,13 @@ start_primary_services() ->
{couch_server, sup_start_link, []},
permanent,
brutal_kill,
- supervisor,
+ worker,
[couch_server]},
{couch_db_update_event,
{gen_event, start_link, [{local, couch_db_update}]},
permanent,
brutal_kill,
- supervisor,
+ worker,
dynamic}
]
}).