summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <adam@cloudant.com>2010-07-10 15:45:46 -0400
committerAdam Kocoloski <adam@cloudant.com>2010-08-12 11:18:48 -0400
commit75c76c2ac385b1b88d1d1202e50e6cab929e0f89 (patch)
treed12bf0470a187fbd72b02c7c4e4c22cdddec5fcc
parentff2c290a40754cb9aa87dbba0bdbb633e1fc4295 (diff)
remove unnecessary chttpd_stats module
-rw-r--r--ebin/chttpd.app1
-rw-r--r--src/chttpd.erl1
-rw-r--r--src/chttpd_stats.erl60
3 files changed, 0 insertions, 62 deletions
diff --git a/ebin/chttpd.app b/ebin/chttpd.app
index c85e58e8..93364fc4 100644
--- a/ebin/chttpd.app
+++ b/ebin/chttpd.app
@@ -11,7 +11,6 @@
chttpd_oauth,
chttpd_rewrite,
chttpd_show,
- chttpd_stats,
chttpd_sup,
chttpd_view,
cloudant_auth
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 9df127dd..ac5ee38c 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -206,7 +206,6 @@ url_handler("_sleep") -> fun chttpd_misc:handle_sleep_req/1;
url_handler("_session") -> fun chttpd_auth:handle_session_req/1;
url_handler("_user") -> fun chttpd_auth:handle_user_req/1;
url_handler("_oauth") -> fun chttpd_oauth:handle_oauth_req/1;
-url_handler("_stats") -> fun chttpd_stats:handle_stats_req/1;
url_handler("_metrics") -> fun chttpd_misc:handle_metrics_req/1;
url_handler("_restart") -> fun showroom_http:handle_restart_req/1;
url_handler("_cloudant") -> fun showroom_httpd_admin:handle_cloudant_req/1;
diff --git a/src/chttpd_stats.erl b/src/chttpd_stats.erl
deleted file mode 100644
index 1200713a..00000000
--- a/src/chttpd_stats.erl
+++ /dev/null
@@ -1,60 +0,0 @@
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License. You may obtain a copy of
-% the License at
-%
-% http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-% License for the specific language governing permissions and limitations under
-% the License.
-
--module(chttpd_stats).
--include_lib("couch/include/couch_db.hrl").
--include_lib("couch/include/couch_stats.hrl").
-
--export([handle_stats_req/1]).
--import(chttpd,
- [send_json/2,send_json/3,send_json/4,send_method_not_allowed/2,
- start_json_response/2,send_chunk/2,end_json_response/1,
- start_chunked_response/3, send_error/4]).
-
--record(stats_query_args, {
- range='0',
- flush=false
-}).
-
-handle_stats_req(#httpd{method='GET', path_parts=[_]}=Req) ->
- send_json(Req, couch_stats_aggregator:all());
-
-handle_stats_req(#httpd{method='GET', path_parts=[_Stats, Module, Key]}=Req) ->
- #stats_query_args{
- range=Range,
- flush=Flush
- } = parse_stats_query(Req),
-
- case Flush of
- true ->
- couch_stats_aggregator:time_passed();
- _ -> ok
- end,
-
- Stats = couch_stats_aggregator:get_json({?b2a(Module), ?b2a(Key)}, Range),
- Response = {[{Module, {[{Key, Stats}]}}]},
- send_json(Req, Response);
-
-handle_stats_req(Req) ->
- send_method_not_allowed(Req, "GET").
-
-parse_stats_query(Req) ->
- lists:foldl(fun({Key,Value}, Args) ->
- case {Key, Value} of
- {"range", Range} ->
- Args#stats_query_args{range=list_to_atom(Range)};
- {"flush", "true"} ->
- Args#stats_query_args{flush=true};
- _Else -> % unknown key value pair, ignore.
- Args
- end
- end, #stats_query_args{}, chttpd:qs(Req)).