diff options
| author | Peter Andersson <[email protected]> | 2012-03-06 10:15:05 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-06 10:15:14 +0100 |
| commit | 2a97b99164a8068e82b7565dfc58a00990dbf109 (patch) | |
| tree | 1ecd6f0e1ba3811904962972edfe03aa7b19448d /lib/common_test/src | |
| parent | 1a3f30697f8789ef4942058873a70c5b2bf4398a (diff) | |
| parent | bedb0de46685241cedaad05165ad65e60a25da60 (diff) | |
| download | otp-2a97b99164a8068e82b7565dfc58a00990dbf109.tar.gz otp-2a97b99164a8068e82b7565dfc58a00990dbf109.tar.bz2 otp-2a97b99164a8068e82b7565dfc58a00990dbf109.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9941-9955' into maint
* origin/peppe/common_test/otp-9941-9955:
Fix problem with handling error_logger events
OTP-9941
OTP-9955
Diffstat (limited to 'lib/common_test/src')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index e43ff875b3..ea79251cfc 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -31,7 +31,7 @@ %% Event handler Callbacks -export([init/1, handle_event/2, handle_call/2, handle_info/2, - terminate/2]). + terminate/1]). id(_Opts) -> ?MODULE. @@ -101,7 +101,8 @@ handle_call({set_logfunc,NewLogFunc},_) -> {ok, NewLogFunc, NewLogFunc}; handle_call(_Query, _State) -> {error, bad_query}. -terminate(_Reason, _Type) -> +terminate(_State) -> + error_logger:delete_report_handler(?MODULE), []. tag_event(Event) -> |