diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-18 09:52:48 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-18 09:52:48 +0200 |
| commit | 0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea (patch) | |
| tree | ebb5e78dcdc59ec6dfa1296bd6118ee1a50e528f /lib | |
| parent | d09b60bb7dc9b588520a0ac4531110f7b43f6979 (diff) | |
| parent | 67603840fe02617e9ee3f6fd46b203b94ac5e3c5 (diff) | |
| download | otp-0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea.tar.gz otp-0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea.tar.bz2 otp-0aae26d8df1aba1f3a8551e4bf1fc097f13a0bea.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index f5e769e1ba..8fed341600 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -34,7 +34,7 @@ %% Event handler Callbacks -export([init/1, handle_event/2, handle_call/2, handle_info/2, - terminate/2, code_change/3]). + terminate/1, terminate/2, code_change/3]). %% Other -export([handle_remote_events/1]). @@ -186,10 +186,13 @@ handle_call({handle_remote_events,Bool}, State) -> handle_call(_Query, _State) -> {error, bad_query}. -terminate(_Arg, _State) -> +terminate(_) -> error_logger:delete_report_handler(?MODULE), []. +terminate(_Arg, _State) -> + ok. + tag_event(Event) -> {calendar:local_time(), Event}. |