You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/31 22:40:21 UTC
[couchdb] branch 2.2.x updated (d408b40 -> 826e26c)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from d408b40 bump fauxton
new ef88643 Improve logging from test_util
new 826e26c remove obsolete update_notification feature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/couch/src/test_util.erl | 3 ++
src/couch_event/src/couch_event_os_sup.erl | 82 ------------------------------
src/couch_event/src/couch_event_sup2.erl | 7 ---
3 files changed, 3 insertions(+), 89 deletions(-)
delete mode 100644 src/couch_event/src/couch_event_os_sup.erl
[couchdb] 02/02: remove obsolete update_notification feature
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 826e26cb473820e1bd899f20a598ee677a8e5a0f
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Tue Jul 31 16:56:43 2018 +0200
remove obsolete update_notification feature
---
src/couch_event/src/couch_event_os_sup.erl | 82 ------------------------------
src/couch_event/src/couch_event_sup2.erl | 7 ---
2 files changed, 89 deletions(-)
diff --git a/src/couch_event/src/couch_event_os_sup.erl b/src/couch_event/src/couch_event_os_sup.erl
deleted file mode 100644
index f219d00..0000000
--- a/src/couch_event/src/couch_event_os_sup.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-% 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.
-
-
-% This causes an OS process to spawned and it is notified every time a database
-% is updated.
-%
-% The notifications are in the form of a the database name sent as a line of
-% text to the OS processes stdout.
-
-
--module(couch_event_os_sup).
--behaviour(supervisor).
--behaviour(config_listener).
-
--vsn(2).
-
--export([
- start_link/0,
- init/1
-]).
-
--export([
- handle_config_change/5,
- handle_config_terminate/3
-]).
-
-
-start_link() ->
- supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-
-
-init([]) ->
- UpdateNotifierExes = config:get("update_notification"),
- Children = [
- {
- config_listener_mon,
- {config_listener_mon, start_link, [?MODULE, nil]},
- permanent,
- 5000,
- worker,
- [config_listener_mon]
- }
- | [child(Id, Exe) || {Id, Exe} <- UpdateNotifierExes]],
-
- {ok, {
- {one_for_one, 10, 3600},
- Children
- }}.
-
-
-handle_config_change("update_notification", Id, deleted, _, _) ->
- supervisor:terminate_child(?MODULE, Id),
- supervisor:delete_child(?MODULE, Id),
- {ok, nil};
-handle_config_change("update_notification", Id, Exe, _, _) when is_list(Exe) ->
- supervisor:start_child(?MODULE, child(Id, Exe)),
- {ok, nil};
-handle_config_change(_, _, _, _, _) ->
- {ok, nil}.
-
-handle_config_terminate(_Server, _Reason, _State) ->
- ok.
-
-child(Id, Arg) ->
- {
- Id,
- {couch_event_os_listener, start_link, [Arg]},
- permanent,
- 1000,
- supervisor,
- [couch_event_os_listener]
- }.
diff --git a/src/couch_event/src/couch_event_sup2.erl b/src/couch_event/src/couch_event_sup2.erl
index 36fbe54..2d88b93 100644
--- a/src/couch_event/src/couch_event_sup2.erl
+++ b/src/couch_event/src/couch_event_sup2.erl
@@ -38,13 +38,6 @@ init(_) ->
5000,
worker,
[couch_event_server]
- },
- {couch_event_os_sup,
- {couch_event_os_sup, start_link, []},
- permanent,
- 5000,
- supervisor,
- [couch_event_os_sup]
}
],
{ok, {{one_for_one, 5, 10}, Children}}.
[couchdb] 01/02: Improve logging from test_util
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ef88643d86de50003e89e53aa3387d83f054bb5c
Author: ILYA Khlopotov <ii...@apache.org>
AuthorDate: Thu Jul 26 06:08:46 2018 -0700
Improve logging from test_util
Sometimes it is hard to guess what went wrong when application
started via `test_util:start_applications` or `test_util:start_couch`
is unable to start. Since the traceback was truncated.
This change would print the reason in addition to the traceback.
---
src/couch/src/test_util.erl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/couch/src/test_util.erl b/src/couch/src/test_util.erl
index 738e9a3..efb5064 100644
--- a/src/couch/src/test_util.erl
+++ b/src/couch/src/test_util.erl
@@ -101,6 +101,9 @@ start_applications([App|Apps], Acc) ->
io:format(standard_error, "Application ~s was left running!~n", [App]),
application:stop(App),
start_applications([App|Apps], Acc);
+ {error, Reason} ->
+ io:format(standard_error, "Cannot start application '~s', reason ~p~n", [App, Reason]),
+ throw({error, {cannot_start, App, Reason}});
ok ->
start_applications(Apps, [App|Acc])
end.