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 8CF9B11897 for ; Sun, 17 Aug 2014 02:25:16 +0000 (UTC) Received: (qmail 19314 invoked by uid 500); 17 Aug 2014 02:25:16 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 19244 invoked by uid 500); 17 Aug 2014 02:25:16 -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 19227 invoked by uid 99); 17 Aug 2014 02:25:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Aug 2014 02:25:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2661D9293B9; Sun, 17 Aug 2014 02:25:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Sun, 17 Aug 2014 02:25:16 -0000 Message-Id: <8f915906dd8243b5bfed0743590e7a8a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] chttpd commit: updated refs/heads/windsor-merge to fe2a94e Repository: couchdb-chttpd Updated Branches: refs/heads/windsor-merge 554ef7486 -> fe2a94ebf Added error_info for maintenance mode errors Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/4dc2fcec Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/4dc2fcec Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/4dc2fcec Branch: refs/heads/windsor-merge Commit: 4dc2fcec0619962936a37cbf486dc429c283334f Parents: 554ef74 Author: Paul J. Davis Authored: Sat Aug 16 21:24:39 2014 -0500 Committer: Paul J. Davis Committed: Sat Aug 16 21:24:39 2014 -0500 ---------------------------------------------------------------------- src/chttpd.erl | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/4dc2fcec/src/chttpd.erl ---------------------------------------------------------------------- diff --git a/src/chttpd.erl b/src/chttpd.erl index fab6695..c4a4fd0 100644 --- a/src/chttpd.erl +++ b/src/chttpd.erl @@ -725,6 +725,8 @@ error_info({error, {nodedown, Reason}}) -> {412, <<"nodedown">>, Reason}; error_info({maintenance_mode, Node}) -> {412, <<"nodedown">>, Node}; +error_info({maintenance_mode, nil, Node}) -> + {412, <<"nodedown">>, Node}; error_info({w_quorum_not_met, Reason}) -> {500, <<"write_quorum_not_met">>, Reason}; error_info(request_uri_too_long) ->