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/10/01 17:21:10 UTC
[1/4] mem3 commit: updated refs/heads/master to 62ac9b2
Repository: couchdb-mem3
Updated Branches:
refs/heads/master 07c865611 -> 62ac9b265
Update to new couch_epi API
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/ae6fe152
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/ae6fe152
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/ae6fe152
Branch: refs/heads/master
Commit: ae6fe1522c5b0bfd9d7a3fd61713976b1b8a6a8b
Parents: 07c8656
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Mon Sep 28 10:28:45 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Mon Sep 28 10:28:45 2015 -0700
----------------------------------------------------------------------
src/mem3_epi.erl | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/mem3_sup.erl | 5 ++---
2 files changed, 53 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/ae6fe152/src/mem3_epi.erl
----------------------------------------------------------------------
diff --git a/src/mem3_epi.erl b/src/mem3_epi.erl
new file mode 100644
index 0000000..5c9f04c
--- /dev/null
+++ b/src/mem3_epi.erl
@@ -0,0 +1,51 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+
+-module(mem3_epi).
+
+-behaviour(couch_epi_plugins).
+
+-export([
+ app/0,
+ providers/0,
+ services/0,
+ data_subscriptions/0,
+ data_providers/0,
+ processes/0,
+ notify/3
+]).
+
+app() ->
+ mem3.
+
+providers() ->
+ [
+ {chttpd_handlers, mem3_httpd_handlers}
+ ].
+
+
+services() ->
+ [
+ ].
+
+data_subscriptions() ->
+ [].
+
+data_providers() ->
+ [].
+
+processes() ->
+ [].
+
+notify(_Key, _Old, _New) ->
+ ok.
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/ae6fe152/src/mem3_sup.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sup.erl b/src/mem3_sup.erl
index 915bee4..f99381e 100644
--- a/src/mem3_sup.erl
+++ b/src/mem3_sup.erl
@@ -18,13 +18,12 @@ start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
init(_Args) ->
- Children = [
+ Children = couch_epi:register_service(mem3_epi) ++ [
child(mem3_events),
child(mem3_nodes),
child(mem3_sync_nodes), % Order important?
child(mem3_sync),
- child(mem3_shards),
- chttpd_handlers:provider(mem3, mem3_httpd_handlers)
+ child(mem3_shards)
],
{ok, {{one_for_one,10,1}, Children}}.
[3/4] mem3 commit: updated refs/heads/master to 62ac9b2
Posted by rn...@apache.org.
Fix code formating
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/8b27392c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/8b27392c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/8b27392c
Branch: refs/heads/master
Commit: 8b27392c176981a5000d216d5f1e3358c36b60b7
Parents: 7f8ec0f
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Sep 29 09:09:25 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Sep 29 09:09:25 2015 -0700
----------------------------------------------------------------------
src/mem3_epi.erl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/8b27392c/src/mem3_epi.erl
----------------------------------------------------------------------
diff --git a/src/mem3_epi.erl b/src/mem3_epi.erl
index 41588f3..ebcd596 100644
--- a/src/mem3_epi.erl
+++ b/src/mem3_epi.erl
@@ -35,8 +35,7 @@ providers() ->
services() ->
- [
- ].
+ [].
data_subscriptions() ->
[].
[2/4] mem3 commit: updated refs/heads/master to 62ac9b2
Posted by rn...@apache.org.
Fix typo in behaviour name
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/7f8ec0fe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/7f8ec0fe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/7f8ec0fe
Branch: refs/heads/master
Commit: 7f8ec0fe69543d370d3a3ad4a34ddb91ca2ea610
Parents: ae6fe15
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Mon Sep 28 13:23:38 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Mon Sep 28 13:23:38 2015 -0700
----------------------------------------------------------------------
src/mem3_epi.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/7f8ec0fe/src/mem3_epi.erl
----------------------------------------------------------------------
diff --git a/src/mem3_epi.erl b/src/mem3_epi.erl
index 5c9f04c..41588f3 100644
--- a/src/mem3_epi.erl
+++ b/src/mem3_epi.erl
@@ -13,7 +13,7 @@
-module(mem3_epi).
--behaviour(couch_epi_plugins).
+-behaviour(couch_epi_plugin).
-export([
app/0,
[4/4] mem3 commit: updated refs/heads/master to 62ac9b2
Posted by rn...@apache.org.
Pass supervisor's children to couch_epi
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/62ac9b26
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/62ac9b26
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/62ac9b26
Branch: refs/heads/master
Commit: 62ac9b2655cc50a9260f37d25829ab7f3c86f251
Parents: 8b27392
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Tue Sep 29 13:04:43 2015 -0700
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Tue Sep 29 13:04:43 2015 -0700
----------------------------------------------------------------------
src/mem3_sup.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/62ac9b26/src/mem3_sup.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sup.erl b/src/mem3_sup.erl
index f99381e..2662a7c 100644
--- a/src/mem3_sup.erl
+++ b/src/mem3_sup.erl
@@ -18,14 +18,14 @@ start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
init(_Args) ->
- Children = couch_epi:register_service(mem3_epi) ++ [
+ Children = [
child(mem3_events),
child(mem3_nodes),
child(mem3_sync_nodes), % Order important?
child(mem3_sync),
child(mem3_shards)
],
- {ok, {{one_for_one,10,1}, Children}}.
+ {ok, {{one_for_one,10,1}, couch_epi:register_service(mem3_epi, Children)}}.
child(mem3_events) ->
MFA = {gen_event, start_link, [{local, mem3_events}]},