diff options
| -rw-r--r-- | share/www/script/test/stats.js | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_server_sup.erl | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/share/www/script/test/stats.js b/share/www/script/test/stats.js index dc3edb1f..8a21dd88 100644 --- a/share/www/script/test/stats.js +++ b/share/www/script/test/stats.js @@ -64,7 +64,7 @@ couchTests.stats = function(debug) { db.createDb(); } - var open_databases = requestStatsTest("couchdb", "open_databases").max; + var open_databases = requestStatsTest("couchdb", "open_databases").current; T(open_databases > 0 && max >= open_databases, name); for(var i=0; i<max+1; i++) { diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl index e59286f3..4c77dbe1 100644 --- a/src/couchdb/couch_server_sup.erl +++ b/src/couchdb/couch_server_sup.erl @@ -32,10 +32,12 @@ start_link(IniFiles) -> end. restart_core_server() -> - supervisor:terminate_child(couch_secondary_services, couch_server), supervisor:terminate_child(couch_primary_services, couch_server), + supervisor:terminate_child(couch_secondary_services, stats_aggregator), + supervisor:terminate_child(couch_secondary_services, stats_collector), supervisor:restart_child(couch_primary_services, couch_server), - supervisor:restart_child(couch_secondary_services, couch_server). + supervisor:restart_child(couch_secondary_services, stats_collector), + supervisor:restart_child(couch_secondary_services, stats_aggregator). couch_config_start_link_wrapper(IniFiles, FirstConfigPid) -> case is_process_alive(FirstConfigPid) of |