diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-06-21 12:44:32 -0500 |
|---|---|---|
| committer | Nick Vatamaniuc <nickva@users.noreply.github.com> | 2018-10-04 12:30:48 -0400 |
| commit | 2e8cde50bd3973fdb40fcd7c0ecd9d299b80dc85 (patch) | |
| tree | a966471c27e9654610b7cefe35098db8cf55718c | |
| parent | 4d3dfc6c0aad1f8786d89616b961a51afec2cd6e (diff) | |
| download | couchdb-2e8cde50bd3973fdb40fcd7c0ecd9d299b80dc85.tar.gz | |
Fix couch_log eunit tests
Fixes #1396
| -rw-r--r-- | src/couch/src/couch_httpd.erl | 7 | ||||
| -rw-r--r-- | src/couch_log/src/couch_log_monitor.erl | 1 | ||||
| -rw-r--r-- | src/couch_log/test/couch_log_test_util.erl | 9 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/couch/src/couch_httpd.erl b/src/couch/src/couch_httpd.erl index ec397c298..e66a78e70 100644 --- a/src/couch/src/couch_httpd.erl +++ b/src/couch/src/couch_httpd.erl @@ -40,6 +40,8 @@ -define(HANDLER_NAME_IN_MODULE_POS, 6). +-define(MAX_DRAIN_BYTES, 1048576). +-define(MAX_DRAIN_TIME_MSEC, 1000). start_link() -> start_link(http). @@ -1181,10 +1183,9 @@ respond_(#httpd{mochi_req = MochiReq}, 413, Headers, Args, Type) -> % just increases the chances of 413 being detected correctly by the client % (rather than getting a brutal TCP reset). erlang:put(mochiweb_request_force_close, true), - Socket = MochiReq:get(socket), - mochiweb_socket:recv(Socket, 0, 0), Result = MochiReq:Type({413, Headers, Args}), - mochiweb_socket:recv(Socket, 0, 0), + Socket = MochiReq:get(socket), + mochiweb_socket:recv(Socket, ?MAX_DRAIN_BYTES, ?MAX_DRAIN_TIME_MSEC), Result; respond_(#httpd{mochi_req = MochiReq}, Code, Headers, Args, Type) -> MochiReq:Type({Code, Headers, Args}). diff --git a/src/couch_log/src/couch_log_monitor.erl b/src/couch_log/src/couch_log_monitor.erl index 236d34012..ab0ae115f 100644 --- a/src/couch_log/src/couch_log_monitor.erl +++ b/src/couch_log/src/couch_log_monitor.erl @@ -38,6 +38,7 @@ start_link() -> init(_) -> + error_logger:start(), ok = gen_event:add_sup_handler(error_logger, ?HANDLER_MOD, []), {ok, nil}. diff --git a/src/couch_log/test/couch_log_test_util.erl b/src/couch_log/test/couch_log_test_util.erl index 05d64d8a9..c7fd34f2d 100644 --- a/src/couch_log/test/couch_log_test_util.erl +++ b/src/couch_log/test/couch_log_test_util.erl @@ -123,9 +123,12 @@ last_log() -> remove_error_loggers() -> - lists:foreach(fun(Handler) -> - error_logger:delete_report_handler(Handler) - end, gen_event:which_handlers(error_logger)). + ErrorLoggerPid = whereis(error_logger), + if ErrorLoggerPid == undefined -> ok; true -> + lists:foreach(fun(Handler) -> + error_logger:delete_report_handler(Handler) + end, gen_event:which_handlers(ErrorLoggerPid)) + end. config_files() -> |