only display sasl reports on error. be less verbose in tests
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7644cf50 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7644cf50 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7644cf50 Branch: refs/heads/1994-merge-rcouch Commit: 7644cf50f5a2017b31d81ff5969f6171a2ee200a Parents: ccb6d7b Author: Benoit Chesneau <beno...@apache.org> Authored: Sun Jan 12 20:58:30 2014 +0100 Committer: Benoit Chesneau <beno...@apache.org> Committed: Sun Jan 12 20:58:30 2014 +0100 ---------------------------------------------------------------------- apps/couch_httpd/src/couch_httpd_misc_handlers.erl | 1 - test/javascript/test_js.escript | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7644cf50/apps/couch_httpd/src/couch_httpd_misc_handlers.erl ---------------------------------------------------------------------- diff --git a/apps/couch_httpd/src/couch_httpd_misc_handlers.erl b/apps/couch_httpd/src/couch_httpd_misc_handlers.erl index 57cc5ec..1999e5e 100644 --- a/apps/couch_httpd/src/couch_httpd_misc_handlers.erl +++ b/apps/couch_httpd/src/couch_httpd_misc_handlers.erl @@ -99,7 +99,6 @@ handle_restart_req(#httpd{method='POST'}=Req) -> ok = couch_httpd:verify_is_server_admin(Req), Result = send_json(Req, 202, {[{ok, true}]}), couch_server_sup:restart_core_server(), - couch_httpd_sup:reload_listeners(), Result; handle_restart_req(Req) -> send_method_not_allowed(Req, "POST"). http://git-wip-us.apache.org/repos/asf/couchdb/blob/7644cf50/test/javascript/test_js.escript ---------------------------------------------------------------------- diff --git a/test/javascript/test_js.escript b/test/javascript/test_js.escript index dac7bd7..e01f68d 100755 --- a/test/javascript/test_js.escript +++ b/test/javascript/test_js.escript @@ -118,6 +118,10 @@ init_code_path() -> start_couch() -> ok = init_code_path(), IniFiles = config_files(), + + application:load(sasl), + application:set_env(sasl, errlog_type, error), + application:load(couch), application:set_env(couch, config_files, IniFiles), couch_util:start_app_deps(couch),
