summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_server_sup.erl
diff options
context:
space:
mode:
authorDamien F. Katz <damien@apache.org>2009-05-30 02:43:52 +0000
committerDamien F. Katz <damien@apache.org>2009-05-30 02:43:52 +0000
commit7860f047be25f99c4d1e83f9456c7eb245ad37dc (patch)
tree8a53ccfc11cb17bd666035892c8dbf14e36d5b0e /src/couchdb/couch_server_sup.erl
parentc1ca0dd42524fb6999e1f05de94ccff71bc497b6 (diff)
Test and fix for infinite loops in view_servers, fix for crashed OS processes causing leaked erlang processes and fix for view server crashing when view group process terminates.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@780165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_server_sup.erl')
-rw-r--r--src/couchdb/couch_server_sup.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 344073a3..e59286f3 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -32,8 +32,10 @@ start_link(IniFiles) ->
end.
restart_core_server() ->
+ supervisor:terminate_child(couch_secondary_services, couch_server),
supervisor:terminate_child(couch_primary_services, couch_server),
- supervisor:restart_child(couch_primary_services, couch_server).
+ supervisor:restart_child(couch_primary_services, couch_server),
+ supervisor:restart_child(couch_secondary_services, couch_server).
couch_config_start_link_wrapper(IniFiles, FirstConfigPid) ->
case is_process_alive(FirstConfigPid) of