couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r978919 - in /couchdb/branches/1.0.x/src/couchdb: couch_changes.erl couch_httpd_db.erl
Date Sat, 24 Jul 2010 18:01:48 GMT
Author: fdmanana
Date: Sat Jul 24 18:01:48 2010
New Revision: 978919

URL: http://svn.apache.org/viewvc?rev=978919&view=rev
Log:
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).


Modified:
    couchdb/branches/1.0.x/src/couchdb/couch_changes.erl
    couchdb/branches/1.0.x/src/couchdb/couch_httpd_db.erl

Modified: couchdb/branches/1.0.x/src/couchdb/couch_changes.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_changes.erl?rev=978919&r1=978918&r2=978919&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_changes.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_changes.erl Sat Jul 24 18:01:48 2010
@@ -38,10 +38,6 @@ handle_changes(#changes_args{style=Style
             ),
             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,

Modified: couchdb/branches/1.0.x/src/couchdb/couch_httpd_db.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_httpd_db.erl?rev=978919&r1=978918&r2=978919&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_httpd_db.erl Sat Jul 24 18:01:48 2010
@@ -106,6 +106,9 @@ handle_changes_req(#httpd{method='GET'}=
             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) ->



Mime
View raw message