You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/09/02 20:34:16 UTC
[1/2] couch commit: updated refs/heads/master to 4d5dd10
Repository: couchdb-couch
Updated Branches:
refs/heads/master 0fdc50bf3 -> 4d5dd10bc
Remove `ignore_providers` option
COUCHDB-2796
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/3c217a08
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/3c217a08
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/3c217a08
Branch: refs/heads/master
Commit: 3c217a08886e09e6b8db28c7ca8802ad203e05cb
Parents: 0fdc50b
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Sep 1 06:23:57 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Sep 1 06:23:57 2015 -0700
----------------------------------------------------------------------
src/couch_db_plugin.erl | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/3c217a08/src/couch_db_plugin.erl
----------------------------------------------------------------------
diff --git a/src/couch_db_plugin.erl b/src/couch_db_plugin.erl
index 1e05c77..1a6d2ea 100644
--- a/src/couch_db_plugin.erl
+++ b/src/couch_db_plugin.erl
@@ -32,8 +32,7 @@
validate_dbname(DbName, Normalized) ->
Handle = couch_epi:get_handle(?SERVICE_ID),
%% callbacks return true only if it specifically allow the given Id
- couch_epi:any(Handle, ?SERVICE_ID, validate_dbname, [DbName, Normalized],
- [ignore_providers]).
+ couch_epi:any(Handle, ?SERVICE_ID, validate_dbname, [DbName, Normalized], []).
before_doc_update(#db{before_doc_update = Fun} = Db, Doc0) ->
case with_pipe(before_doc_update, [Doc0, Db]) of
@@ -50,24 +49,23 @@ after_doc_read(#db{after_doc_read = Fun} = Db, Doc0) ->
validate_docid(Id) ->
Handle = couch_epi:get_handle(?SERVICE_ID),
%% callbacks return true only if it specifically allow the given Id
- couch_epi:any(Handle, ?SERVICE_ID, validate_docid, [Id], [ignore_providers]).
+ couch_epi:any(Handle, ?SERVICE_ID, validate_docid, [Id], []).
check_is_admin(Db) ->
Handle = couch_epi:get_handle(?SERVICE_ID),
%% callbacks return true only if it specifically allow the given Id
- couch_epi:any(Handle, ?SERVICE_ID, check_is_admin, [Db], [ignore_providers]).
+ couch_epi:any(Handle, ?SERVICE_ID, check_is_admin, [Db], []).
on_delete(DbName, Options) ->
Handle = couch_epi:get_handle(?SERVICE_ID),
- couch_epi:apply(Handle, ?SERVICE_ID, on_delete, [DbName, Options],
- [ignore_providers]).
+ couch_epi:apply(Handle, ?SERVICE_ID, on_delete, [DbName, Options], []).
%% ------------------------------------------------------------------
%% Internal Function Definitions
%% ------------------------------------------------------------------
with_pipe(Func, Args) ->
- do_apply(Func, Args, [ignore_providers, pipe]).
+ do_apply(Func, Args, [pipe]).
do_apply(Func, Args, Opts) ->
Handle = couch_epi:get_handle(?SERVICE_ID),
[2/2] couch commit: updated refs/heads/master to 4d5dd10
Posted by rn...@apache.org.
Register service
COUCHDB-2796
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/4d5dd10b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/4d5dd10b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/4d5dd10b
Branch: refs/heads/master
Commit: 4d5dd10bcb3074794d4a3c4fe2360f1f9ec89cff
Parents: 3c217a0
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Wed Sep 2 09:47:56 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed Sep 2 09:47:56 2015 -0700
----------------------------------------------------------------------
src/couch_secondary_sup.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/4d5dd10b/src/couch_secondary_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_secondary_sup.erl b/src/couch_secondary_sup.erl
index 4bda4ef..0f62575 100644
--- a/src/couch_secondary_sup.erl
+++ b/src/couch_secondary_sup.erl
@@ -18,6 +18,7 @@ start_link() ->
supervisor:start_link({local,couch_secondary_services}, ?MODULE, []).
init([]) ->
+ couch_epi:register_service(couch_db),
SecondarySupervisors = [
{couch_plugin_event,
{gen_event, start_link, [{local, couch_plugin}]},