You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/02/04 16:49:43 UTC
[1/3] couchdb-ioq git commit: Update config_listener behaviuor
Repository: couchdb-ioq
Updated Branches:
refs/heads/master 217503577 -> c7c75ebea
Update config_listener behaviuor
COUCHDB-2561
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/commit/ad60d329
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/tree/ad60d329
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/diff/ad60d329
Branch: refs/heads/master
Commit: ad60d329a038d2b1aa5ee083f22b1ee7906ec31d
Parents: 2175035
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Jan 30 10:59:43 2015 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Fri Jan 30 10:59:43 2015 -0800
----------------------------------------------------------------------
src/ioq.erl | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ioq/blob/ad60d329/src/ioq.erl
----------------------------------------------------------------------
diff --git a/src/ioq.erl b/src/ioq.erl
index 6c01b9c..c4b3b4e 100644
--- a/src/ioq.erl
+++ b/src/ioq.erl
@@ -18,7 +18,7 @@
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, code_change/3, terminate/2]).
% config_listener api
--export([handle_config_change/5]).
+-export([handle_config_change/5, handle_config_terminate/3]).
-record(state, {
concurrency,
@@ -83,12 +83,6 @@ handle_info({'DOWN', Ref, _, _, Reason}, State) ->
false ->
{noreply, State, 0}
end;
-handle_info({gen_event_EXIT, {config_listener, ?MODULE}, _Reason}, State) ->
- erlang:send_after(5000, self(), restart_config_listener),
- {noreply, State};
-handle_info(restart_config_listener, State) ->
- ok = config:listen_for_changes(?MODULE, nil),
- {noreply, State};
handle_info(timeout, State) ->
{noreply, maybe_submit_request(State)}.
@@ -97,6 +91,13 @@ handle_config_change("ioq", _, _, _, _) ->
handle_config_change(_, _, _, _, _) ->
{ok, nil}.
+handle_config_terminate(_, _, _) ->
+ spawn(fun() ->
+ timer:sleep(5000),
+ config:listen_for_changes(?MODULE, nil)
+ end),
+ ok.
+
code_change(_Vsn, State, _Extra) ->
{ok, State}.
[2/3] couchdb-ioq git commit: Don't restart event handler on
termination
Posted by kx...@apache.org.
Don't restart event handler on termination
COUCHDB-2561
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/commit/0ffa7cd9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/tree/0ffa7cd9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/diff/0ffa7cd9
Branch: refs/heads/master
Commit: 0ffa7cd9fd1e89ae667ed234d21e04696e3033ae
Parents: ad60d32
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Jan 30 11:30:02 2015 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Fri Jan 30 11:30:02 2015 -0800
----------------------------------------------------------------------
src/ioq.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ioq/blob/0ffa7cd9/src/ioq.erl
----------------------------------------------------------------------
diff --git a/src/ioq.erl b/src/ioq.erl
index c4b3b4e..967a49b 100644
--- a/src/ioq.erl
+++ b/src/ioq.erl
@@ -91,6 +91,7 @@ handle_config_change("ioq", _, _, _, _) ->
handle_config_change(_, _, _, _, _) ->
{ok, nil}.
+handle_config_terminate(_, stop, _) -> ok;
handle_config_terminate(_, _, _) ->
spawn(fun() ->
timer:sleep(5000),
[3/3] couchdb-ioq git commit: Merge remote-tracking branch
'iilyak/2561-make-config-API-consistent'
Posted by kx...@apache.org.
Merge remote-tracking branch 'iilyak/2561-make-config-API-consistent'
This closes #3
COUCHDB-2561
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/commit/c7c75ebe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/tree/c7c75ebe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ioq/diff/c7c75ebe
Branch: refs/heads/master
Commit: c7c75ebeaf41599e3a3e211097d864f0e7785829
Parents: 2175035 0ffa7cd
Author: Alexander Shorin <kx...@apache.org>
Authored: Wed Feb 4 18:43:21 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Wed Feb 4 18:43:21 2015 +0300
----------------------------------------------------------------------
src/ioq.erl | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------