requestStats takes an array

4 files changed, 10 insertions, 10 deletions

diff --git a/share/www/script/couch.js b/share/www/script/couch.js
index 31b3830b1..7e4eeed73 100644
--- a/share/www/script/couch.js
+++ b/share/www/script/couch.js
@@ -432,13 +432,13 @@ CouchDB.request = function(method, uri, options) {
   return req;
 };
 
-CouchDB.requestStats = function(module, key, test) {
+CouchDB.requestStats = function(path, test) {
   var query_arg = "";
   if(test !== null) {
     query_arg = "?flush=true";
   }
 
-  var url = "/_stats/" + module + "/" + key + query_arg;
+  var url = "/_stats/" + path.join("/") + query_arg;
   var stat = CouchDB.request("GET", url).responseText;
   return JSON.parse(stat);
 };
diff --git a/share/www/script/test/auth_cache.js b/share/www/script/test/auth_cache.js
index 2229c2070..17cb70f08 100644
--- a/share/www/script/test/auth_cache.js
+++ b/share/www/script/test/auth_cache.js
@@ -51,13 +51,13 @@ couchTests.auth_cache = function(debug) {
 
 
   function hits() {
-    var hits = CouchDB.requestStats("couchdb", "auth_cache_hits", true);
+    var hits = CouchDB.requestStats(["couchdb", "auth_cache_hits"], true);
     return hits.current || 0;
   }
 
 
   function misses() {
-    var misses = CouchDB.requestStats("couchdb", "auth_cache_misses", true);
+    var misses = CouchDB.requestStats(["couchdb", "auth_cache_misses"], true);
     return misses.current || 0;
   }
 
diff --git a/share/www/script/test/changes.js b/share/www/script/test/changes.js
index b034a0b4a..d1c0c029f 100644
--- a/share/www/script/test/changes.js
+++ b/share/www/script/test/changes.js
@@ -609,9 +609,9 @@ couchTests.changes = function(debug) {
   TEquals("0", resp.results[0].id);
   TEquals("1", resp.results[1].id);
 
-  TEquals(0, CouchDB.requestStats('httpd', 'clients_requesting_changes').current);
+  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes']).value);
   CouchDB.request("GET", "/" + db.name + "/_changes");
-  TEquals(0, CouchDB.requestStats('httpd', 'clients_requesting_changes').current);
+  TEquals(0, CouchDB.requestStats(['couchdb', 'httpd', 'clients_requesting_changes']).value);
 
   // COUCHDB-1256
   T(db.deleteDb());
diff --git a/share/www/spec/couch_js_class_methods_spec.js b/share/www/spec/couch_js_class_methods_spec.js
index 7eac2348c..6b64c195d 100644
--- a/share/www/spec/couch_js_class_methods_spec.js
+++ b/share/www/spec/couch_js_class_methods_spec.js
@@ -292,19 +292,19 @@ describe 'CouchDB class'
     end
     
     describe '.requestStats'
-      it 'should get the stats for specified module and key'
-        var stats = CouchDB.requestStats('couchdb', 'open_databases', null);
+      it 'should get the stats for specified path'
+        var stats = CouchDB.requestStats(['couchdb', 'open_databases'], null);
         stats.description.should.eql 'number of open databases'
         stats.current.should.be_a Number
       end
       
       it 'should add flush true to the request when there is a test argument'
         CouchDB.should.receive("request", "once").with_args("GET", "/_stats/httpd/requests?flush=true")
-        CouchDB.requestStats('httpd', 'requests', 'test');
+        CouchDB.requestStats(['httpd', 'requests'], 'test');
       end
       
       it 'should still work when there is a test argument'
-        var stats = CouchDB.requestStats('httpd_status_codes', '200', 'test');
+        var stats = CouchDB.requestStats(['httpd_status_codes', '200'], 'test');
         stats.description.should.eql 'number of HTTP 200 OK responses'
         stats.sum.should.be_a Number
       end