Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F13F81883E for ; Tue, 1 Mar 2016 20:00:35 +0000 (UTC) Received: (qmail 97875 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 97249 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 96387 invoked by uid 99); 1 Mar 2016 20:00:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 20:00:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7124E17CF; Tue, 1 Mar 2016 20:00:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 01 Mar 2016 20:01:00 -0000 Message-Id: <4b839736b8b5421ba01c121eba0e1d99@git.apache.org> In-Reply-To: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> References: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372 Extract maybe_log_response function Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/460d75de Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/460d75de Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/460d75de Branch: refs/heads/split_out_httpd_stack Commit: 460d75de7adeb954988cb42a966ba8c44e1f4a8c Parents: 2bde01e Author: ILYA Khlopotov Authored: Fri Feb 26 10:38:07 2016 -0800 Committer: ILYA Khlopotov Committed: Tue Mar 1 08:35:08 2016 -0800 ---------------------------------------------------------------------- src/couch_httpd.erl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/460d75de/src/couch_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl index 1ac15a4..80f79af 100644 --- a/src/couch_httpd.erl +++ b/src/couch_httpd.erl @@ -201,12 +201,7 @@ start_delayed_json_response(Req, Code, Headers, FirstChunk) -> send_response(#httpd{}=Req, Code, Headers, Body) -> Resp = handle_response(Req, Code, Headers, Body, respond), - if Code >= 500 -> - couch_log:error("httpd ~p error response:~n ~s", [Code, Body]); - Code >= 400 -> - couch_log:debug("httpd ~p error response:~n ~s", [Code, Body]); - true -> ok - end, + maybe_log_response(Code, Body), {ok, Resp}. send_json(Req, Value) -> @@ -949,6 +944,13 @@ respond_(#httpd{mochi_req = MochiReq}, Code, Headers, _Args, start_response) -> respond_(#httpd{mochi_req = MochiReq}, Code, Headers, Args, Type) -> MochiReq:Type({Code, Headers, Args}). +maybe_log_response(Code, Body) when Code >= 500 -> + couch_log:error("httpd ~p error response:~n ~s", [Code, Body]); +maybe_log_response(Code, Body) when Code >= 400 -> + couch_log:debug("httpd ~p error response:~n ~s", [Code, Body]); +maybe_log_response(_, _) -> + ok. + %%%%%%%% module tests below %%%%%%%% -ifdef(TEST).