From 0f575441b4938e75068b88c7e32698de3e3af9df Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Sat, 24 Oct 2009 21:53:02 +0000
Subject: Fixed the test for couch_stats_aggregator.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@829456 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_httpd_show.erl       |  2 +-
 src/couchdb/couch_stats_aggregator.erl | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/couchdb/couch_httpd_show.erl b/src/couchdb/couch_httpd_show.erl
index 19785f5d..896c833e 100644
--- a/src/couchdb/couch_httpd_show.erl
+++ b/src/couchdb/couch_httpd_show.erl
@@ -40,7 +40,7 @@ handle_doc_show_req(Req, _Db) ->
     send_method_not_allowed(Req, "GET,POST,HEAD").
 
 
-handle_doc_update_req(#httpd{method = 'GET'}=Req, Db) ->
+handle_doc_update_req(#httpd{method = 'GET'}=Req, _Db) ->
     send_method_not_allowed(Req, "POST,PUT,DELETE,ETC");
     
 handle_doc_update_req(#httpd{
diff --git a/src/couchdb/couch_stats_aggregator.erl b/src/couchdb/couch_stats_aggregator.erl
index 01e0f62a..3292e5f0 100644
--- a/src/couchdb/couch_stats_aggregator.erl
+++ b/src/couchdb/couch_stats_aggregator.erl
@@ -13,7 +13,7 @@
 -module(couch_stats_aggregator).
 -behaviour(gen_server).
 
--export([start/0, stop/0]).
+-export([start/0, start/1, stop/0]).
 -export([all/0, all/1, get/1, get/2, get_json/1, get_json/2, collect_sample/0]).
 
 -export([init/1, terminate/2, code_change/3]).
@@ -35,7 +35,11 @@
 
 
 start() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+    PrivDir = couch_util:priv_dir(),
+    start(filename:join(PrivDir, "stat_descriptions.cfg")).
+    
+start(FileName) ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [FileName], []).
 
 stop() ->
     gen_server:cast(?MODULE, stop).
@@ -85,13 +89,12 @@ collect_sample() ->
     gen_server:call(?MODULE, collect_sample).
 
 
-init(_) ->
+init(StatDescsFileName) ->
     % Create an aggregate entry for each {description, rate} pair.
     ets:new(?MODULE, [named_table, set, protected]),
     SampleStr = couch_config:get("stats", "samples", "[0]"),
     {ok, Samples} = couch_util:parse_term(SampleStr),
-    PrivDir = couch_util:priv_dir(),
-    {ok, Descs} = file:consult(filename:join(PrivDir, "stat_descriptions.cfg")),
+    {ok, Descs} = file:consult(StatDescsFileName),
     lists:foreach(fun({Sect, Key, Value}) ->
         lists:foreach(fun(Secs) ->
             Agg = #aggregate{
-- 
cgit v1.2.3