couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to 4c0564f
Date Tue, 12 Apr 2016 16:26:13 GMT
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 <rnewson@apache.org>
Authored: Tue Apr 12 16:39:44 2016 +0100
Committer: Robert Newson <rnewson@apache.org>
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.
 


Mime
View raw message