Author: jan Date: Wed May 13 13:12:51 2009 New Revision: 774320 URL: http://svn.apache.org/viewvc?rev=774320&view=rev Log: merged r762019 from trunk
Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl Propchange: couchdb/branches/0.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:12:51 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 Propchange: couchdb/branches/0.9.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:12:51 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440 Modified: couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl?rev=774320&r1=774319&r2=774320&view=diff ============================================================================== --- couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl (original) +++ couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl Wed May 13 13:12:51 2009 @@ -109,7 +109,7 @@ handle_request(MochiReq, UrlHandlers, DbUrlHandlers, DesignUrlHandlers) -> - statistics(runtime), % prepare request_time counter, see end of function + Begin = now(), AuthenticationFun = make_arity_1_fun( couch_config:get("httpd", "authentication_handler")), % for the path, use the raw path with the query string and fragment @@ -180,7 +180,7 @@ RawUri, Resp:get(code) ]), - {_TotalRuntime, RequestTime} = statistics(runtime), + RequestTime = round(timer:now_diff(now(), Begin)/1000), couch_stats_collector:record({couchdb, request_time}, RequestTime), couch_stats_collector:increment({httpd, requests}), {ok, Resp}.