From b1fa0b7889d4e790a4ea3170f2f3927b14a0bcd0 Mon Sep 17 00:00:00 2001 From: Filipe David Borba Manana Date: Sat, 24 Jul 2010 18:01:48 +0000 Subject: Merge revision 978918 from trunk: Move the tracking of the stat {httpd, clients_requesting_changes} from couch_changes module into the couch_httpd_db module (that stat shouldn't be affected when the changes API is used for internal operations). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@978919 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_changes.erl | 4 ---- src/couchdb/couch_httpd_db.erl | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl index 52ebea69..3a5bc4f8 100644 --- a/src/couchdb/couch_changes.erl +++ b/src/couchdb/couch_changes.erl @@ -38,10 +38,6 @@ handle_changes(#changes_args{style=Style}=Args1, Req, Db) -> ), start_sending_changes(Callback, Args#changes_args.feed), {Timeout, TimeoutFun} = get_changes_timeout(Args, Callback), - couch_stats_collector:track_process_count( - Self, - {httpd, clients_requesting_changes} - ), try keep_sending_changes( Args, diff --git a/src/couchdb/couch_httpd_db.erl b/src/couchdb/couch_httpd_db.erl index f7682422..b8d3157e 100644 --- a/src/couchdb/couch_httpd_db.erl +++ b/src/couchdb/couch_httpd_db.erl @@ -106,6 +106,9 @@ handle_changes_req(#httpd{method='GET'}=Req, Db) -> FeedChangesFun(MakeCallback(Resp)) end end, + couch_stats_collector:track_process_count( + {httpd, clients_requesting_changes} + ), WrapperFun(ChangesFun); handle_changes_req(#httpd{path_parts=[_,<<"_changes">>]}=Req, _Db) -> -- cgit v1.2.3