diff options
| author | Peter Andersson <[email protected]> | 2013-09-12 12:15:36 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-09-12 12:15:36 +0200 |
| commit | 11522f343c082ac9e3ff0210f2d0f0a023a8048c (patch) | |
| tree | 6a65afa8289416a656b16e6122b6d45180325ede /lib | |
| parent | 8161fa7decd5410888b116b7f823d353a1e9934b (diff) | |
| parent | 39d1c9f9f3d63a597fdc21494877cace931a8494 (diff) | |
| download | otp-11522f343c082ac9e3ff0210f2d0f0a023a8048c.tar.gz otp-11522f343c082ac9e3ff0210f2d0f0a023a8048c.tar.bz2 otp-11522f343c082ac9e3ff0210f2d0f0a023a8048c.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common_test/src/cth_log_redirect.erl | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl index 11af1aa346..4ee7e48a67 100644 --- a/lib/common_test/src/cth_log_redirect.erl +++ b/lib/common_test/src/cth_log_redirect.erl @@ -135,8 +135,19 @@ handle_event(Event, #eh_state{log_func = LogFunc} = State) -> end, {ok, State}. +handle_info({'EXIT',User,killed}, State) -> + case whereis(user) of + %% init:stop/1/2 has been called, let's finish! + undefined -> + remove_handler; + User -> + remove_handler; + _ -> + {ok,State} + end; -handle_info(_,State) -> {ok, State}. +handle_info(_, State) -> + {ok,State}. handle_call(flush,State) -> {ok, ok, State}; |