You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ii...@apache.org on 2016/11/12 00:21:44 UTC
[1/2] chttpd commit: updated refs/heads/master to d6282b0
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master c1f035f1b -> d6282b03e
Handle error terms from fabric
The fabric returns errors as {Class, Reason, Stack}
(see fabric_util:error_info/2).
Add the clause to error_info to handle it.
COUCHDB-3195
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/a987f5ca
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/a987f5ca
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/a987f5ca
Branch: refs/heads/master
Commit: a987f5ca6a7e2974e7958dc00e949076e297f0e1
Parents: c1f035f
Author: ILYA Khlopotov <ii...@apache.org>
Authored: Thu Oct 13 15:02:20 2016 -0700
Committer: ILYA Khlopotov <ii...@apache.org>
Committed: Fri Nov 11 16:20:51 2016 -0800
----------------------------------------------------------------------
src/chttpd.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/a987f5ca/src/chttpd.erl
----------------------------------------------------------------------
diff --git a/src/chttpd.erl b/src/chttpd.erl
index 1723ebc..e2ab054 100644
--- a/src/chttpd.erl
+++ b/src/chttpd.erl
@@ -908,7 +908,7 @@ error_info({_Error, _Reason} = Error) ->
error_info({Error, nil, _Stack}) ->
error_info(Error);
error_info({Error, Reason, _Stack}) ->
- {500, couch_util:to_binary(Error), couch_util:to_binary(Reason)};
+ error_info({Error, Reason});
error_info(Error) ->
maybe_handle_error(Error).
[2/2] chttpd commit: updated refs/heads/master to d6282b0
Posted by ii...@apache.org.
Merge remote branch 'cloudant:71810-handle-errors-terms-from-fabric'
This closes #146
Signed-off-by: ILYA Khlopotov <ii...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/d6282b03
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/d6282b03
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/d6282b03
Branch: refs/heads/master
Commit: d6282b03e8c0632d1378a637187eb760af90869c
Parents: c1f035f a987f5c
Author: ILYA Khlopotov <ii...@apache.org>
Authored: Fri Nov 11 16:21:20 2016 -0800
Committer: ILYA Khlopotov <ii...@apache.org>
Committed: Fri Nov 11 16:21:20 2016 -0800
----------------------------------------------------------------------
src/chttpd.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------