aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-10-31 16:40:14 +0100
committerRaimo Niskanen <[email protected]>2018-11-30 10:43:08 +0100
commit8893e9f9d0a25c0b3c8cc78765df5cdc0de0bdf8 (patch)
tree30fc878e291069fe8171c367d2f36020754f5596 /lib
parent65983ac6b21886010b9cab47ab905fd783a79f67 (diff)
downloadotp-8893e9f9d0a25c0b3c8cc78765df5cdc0de0bdf8.tar.gz
otp-8893e9f9d0a25c0b3c8cc78765df5cdc0de0bdf8.tar.bz2
otp-8893e9f9d0a25c0b3c8cc78765df5cdc0de0bdf8.zip
Adjust sys:log(N, get) to documentation
Diffstat (limited to 'lib')
-rw-r--r--lib/stdlib/src/gen_fsm.erl4
-rw-r--r--lib/stdlib/src/gen_server.erl4
-rw-r--r--lib/stdlib/src/gen_statem.erl4
-rw-r--r--lib/stdlib/src/sys.erl4
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 49e3f5981e..fec7c6a5a3 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -624,7 +624,7 @@ terminate(Reason, Name, From, Msg, Mod, StateName, StateData, Debug) ->
end.
error_info(Reason, Name, From, Msg, StateName, StateData, Debug) ->
- Log = [{Event, State} || {Event, State, _FormFunc} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
?LOG_ERROR(#{label=>{gen_fsm,terminate},
name=>Name,
last_message=>Msg,
@@ -747,7 +747,7 @@ format_status(Opt, StatusData) ->
StatusData,
Header = gen:format_status_header("Status for state machine",
Name),
- Log = [SysEvent || {SysEvent,_,_} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
Specfic = format_status(Opt, Mod, PDict, StateData),
Specfic = case format_status(Opt, Mod, PDict, StateData) of
S when is_list(S) -> S;
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index f57c136296..7a415c7620 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -885,7 +885,7 @@ error_info(_Reason, application_controller, _From, _Msg, _Mod, _State, _Debug) -
%% of it instead
ok;
error_info(Reason, Name, From, Msg, Mod, State, Debug) ->
- Log = [SysEvent || {SysEvent,_,_} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
?LOG_ERROR(#{label=>{gen_server,terminate},
name=>Name,
last_message=>Msg,
@@ -978,7 +978,7 @@ format_client_log({_From,{Name,Stacktrace}}) ->
format_status(Opt, StatusData) ->
[PDict, SysState, Parent, Debug, [Name, State, Mod, _Time, _HibernateAfterTimeout]] = StatusData,
Header = gen:format_status_header("Status for generic server", Name),
- Log = [{Ev, St} || {Ev, St, _FormFunc} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
Specfic = case format_status(Opt, Mod, PDict, State) of
S when is_list(S) -> S;
S -> [S]
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 3eb9ff3aca..4efe68d7f9 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -807,7 +807,7 @@ format_status(
[PDict,SysState,Parent,Debug,
#state{name = Name, postponed = P} = S]) ->
Header = gen:format_status_header("Status for state machine", Name),
- Log = [{Event, State} || {Event, State, _FormFunc} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
[{header,Header},
{data,
[{"Status",SysState},
@@ -1953,7 +1953,7 @@ error_info(
state_enter = StateEnter,
postponed = P} = S,
Q) ->
- Log = [SysEvent || {SysEvent,_,_} <- sys:get_log(Debug)],
+ Log = sys:get_log(Debug),
?LOG_ERROR(#{label=>{gen_statem,terminate},
name=>Name,
queue=>Q,
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index 6775dfe933..09fe497d11 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -548,7 +548,7 @@ debug_cmd({log, print}, Debug) ->
{ok, Debug};
debug_cmd({log, get}, Debug) ->
NLog = get_debug(log, Debug, nlog_new()),
- {{ok, nlog_get(NLog)}, Debug};
+ {{ok, [Event || {Event, _State, _FormFunc} <- nlog_get(NLog)]}, Debug};
debug_cmd({log_to_file, false}, Debug) ->
NDebug = close_log_file(Debug),
{ok, NDebug};
@@ -639,7 +639,7 @@ print_log(Debug) ->
Debug :: [dbg_opt()].
get_log(Debug) ->
NLog = get_debug(log, Debug, nlog_new()),
- nlog_get(NLog).
+ [Event || {Event, _State, _FormFunc} <- nlog_get(NLog)].
close_log_file(Debug) ->
case get_debug2(log_to_file, Debug, []) of