aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-10-18 09:52:38 +0200
committerFredrik Gustafsson <[email protected]>2013-10-18 09:52:38 +0200
commit67603840fe02617e9ee3f6fd46b203b94ac5e3c5 (patch)
treefe2bea28f9bd9f5ff03a9c8f176d422d0308de0f /lib
parentd52be57446a2d0d15e3f67d2beb834fbad1b578e (diff)
parent1a5586520ff809d49df2a1bca5235e944baaf0e3 (diff)
downloadotp-67603840fe02617e9ee3f6fd46b203b94ac5e3c5.tar.gz
otp-67603840fe02617e9ee3f6fd46b203b94ac5e3c5.tar.bz2
otp-67603840fe02617e9ee3f6fd46b203b94ac5e3c5.zip
Merge branch 'fredrik/common_test/cth_log_redirect' into maint
* fredrik/common_test/cth_log_redirect: common_test: Add terminate/1
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/src/cth_log_redirect.erl7
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}.