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 19923192FA for ; Tue, 12 Apr 2016 16:26:14 +0000 (UTC) Received: (qmail 55241 invoked by uid 500); 12 Apr 2016 16:26:14 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 55207 invoked by uid 500); 12 Apr 2016 16:26:13 -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 55198 invoked by uid 99); 12 Apr 2016 16:26:13 -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, 12 Apr 2016 16:26:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A840FDFDE0; Tue, 12 Apr 2016 16:26:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Message-Id: <94b17a5d3c29453fb09fb847533de672@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: chttpd commit: updated refs/heads/master to 4c0564f Date: Tue, 12 Apr 2016 16:26:13 +0000 (UTC) Repository: couchdb-chttpd Updated Branches: refs/heads/master 1ca86421b -> 4c0564fc3 tolerate failure when inserting auth ddoc COUCHDB-2986 Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/4c0564fc Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/4c0564fc Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/4c0564fc Branch: refs/heads/master Commit: 4c0564fc36fcb7204eb98a7fc2228890c1c54fbf Parents: 1ca8642 Author: Robert Newson Authored: Tue Apr 12 16:39:44 2016 +0100 Committer: Robert Newson Committed: Tue Apr 12 16:41:31 2016 +0100 ---------------------------------------------------------------------- src/chttpd_auth_cache.erl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/4c0564fc/src/chttpd_auth_cache.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_auth_cache.erl b/src/chttpd_auth_cache.erl index 8a64ae7..c83a3c0 100644 --- a/src/chttpd_auth_cache.erl +++ b/src/chttpd_auth_cache.erl @@ -198,7 +198,10 @@ ensure_auth_ddoc_exists(DbName, DDocId) -> {<<"validate_doc_update">>, ?AUTH_DB_DOC_VALIDATE_FUNCTION}), update_doc_ignoring_conflict(DbName, couch_doc:from_json_obj({Props1}), [?ADMIN_CTX]) - end + end; + {error, Reason} -> + couch_log:notice("Failed to ensure auth ddoc ~s/~s exists for reason: ~p", [DbName, DDocId, Reason]), + ok end, ok.