Skip to content

Commit 7dbd3ca

Browse files
committed
Remove unused code in error logger handlers
A long time ago, errors from the emulator itself was sent as messages that would end up in the handle_info/2 function. Those clauses in handle_info/2 can be removed. The code for handling events tagged 'info' instead of 'info_msg' can also be taken out.
1 parent 7e5c215 commit 7dbd3ca

File tree

2 files changed

+4
-43
lines changed

2 files changed

+4
-43
lines changed

lib/stdlib/src/error_logger_file_h.erl

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
%%%
2626
%%% A handler that can be connected to the error_logger
27-
%%% event handler.
28-
%%% Writes all events formatted to file.
29-
%%% Handles events tagged error, emulator and info.
27+
%%% event handler. Writes all events formatted to file.
3028
%%%
3129
%%% It can only be started from error_logger:swap_handler({logfile, File})
32-
%%% or error_logger:logfile(File)
30+
%%% or error_logger:logfile(File).
3331
%%%
3432

3533
-export([init/1,
@@ -73,13 +71,6 @@ handle_info({'EXIT', Fd, _Reason}, {Fd, _File, PrevHandler}) ->
7371
_ ->
7472
{swap_handler, install_prev, [], PrevHandler, go_back}
7573
end;
76-
handle_info({emulator, GL, Chars}, {Fd, File, PrevHandler})
77-
when node(GL) == node() ->
78-
write_event(Fd, tag_event({emulator, GL, Chars})),
79-
{ok, {Fd, File, PrevHandler}};
80-
handle_info({emulator, noproc, Chars}, {Fd, File, PrevHandler}) ->
81-
write_event(Fd, tag_event({emulator, noproc, Chars})),
82-
{ok, {Fd, File, PrevHandler}};
8374
handle_info(_, State) ->
8475
{ok, State}.
8576

@@ -124,17 +115,6 @@ write_event(Fd, {Time, {error, _GL, {Pid, Format, Args}}}) ->
124115
F = add_node("ERROR: ~p - ~p~n", Pid),
125116
io:format(Fd, T ++ F, [Format,Args])
126117
end;
127-
write_event(Fd, {Time, {emulator, _GL, Chars}}) ->
128-
T = write_time(maybe_utc(Time)),
129-
case catch io_lib:format(Chars, []) of
130-
S when is_list(S) ->
131-
io:format(Fd, T ++ S, []);
132-
_ ->
133-
io:format(Fd, T ++ "ERROR: ~p ~n", [Chars])
134-
end;
135-
write_event(Fd, {Time, {info, _GL, {Pid, Info, _}}}) ->
136-
T = write_time(maybe_utc(Time)),
137-
io:format(Fd, T ++ add_node("~p~n",Pid),[Info]);
138118
write_event(Fd, {Time, {error_report, _GL, {Pid, std_error, Rep}}}) ->
139119
T = write_time(maybe_utc(Time)),
140120
S = format_report(Rep),

lib/stdlib/src/error_logger_tty_h.erl

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323

2424
%%%
2525
%%% A handler that can be connected to the error_logger
26-
%%% event handler.
27-
%%% Writes all events formatted to stdout.
28-
%%% Handles events tagged error, emulator and info.
26+
%%% event handler. Writes all events formatted to stdout.
2927
%%%
3028
%%% It can only be started from error_logger:swap_handler(tty)
31-
%%% or error_logger:tty(true)
29+
%%% or error_logger:tty(true).
3230
%%%
3331

3432
-export([init/1,
@@ -66,12 +64,6 @@ handle_info({'EXIT', User, _Reason}, {User, PrevHandler}) ->
6664
{swap_handler, install_prev, {User, PrevHandler},
6765
PrevHandler, go_back}
6866
end;
69-
handle_info({emulator, GL, Chars}, State) when node(GL) == node() ->
70-
ok = write_event(tag_event({emulator, GL, Chars}),io),
71-
{ok, State};
72-
handle_info({emulator, noproc, Chars}, State) ->
73-
ok = write_event(tag_event({emulator, noproc, Chars}),io),
74-
{ok, State};
7567
handle_info(_, State) ->
7668
{ok, State}.
7769

@@ -118,17 +110,6 @@ write_event({Time, {error, _GL, {Pid, Format, Args}}},IOMod) ->
118110
F = add_node("ERROR: ~p - ~p~n", Pid),
119111
format(IOMod, T ++ F, [Format,Args])
120112
end;
121-
write_event({Time, {emulator, _GL, Chars}},IOMod) ->
122-
T = write_time(maybe_utc(Time)),
123-
case catch io_lib:format(Chars, []) of
124-
S when is_list(S) ->
125-
format(IOMod, T ++ S);
126-
_ ->
127-
format(IOMod, T ++ "ERROR: ~p ~n", [Chars])
128-
end;
129-
write_event({Time, {info, _GL, {Pid, Info, _}}},IOMod) ->
130-
T = write_time(maybe_utc(Time)),
131-
format(IOMod, T ++ add_node("~p~n",Pid),[Info]);
132113
write_event({Time, {error_report, _GL, {Pid, std_error, Rep}}},IOMod) ->
133114
T = write_time(maybe_utc(Time)),
134115
S = format_report(Rep),

0 commit comments

Comments
 (0)