diff options
author | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2019-03-04 12:07:02 +0100 |
commit | 4d72eedc0d3573e9709b8f2c8773429e85529d7f (patch) | |
tree | 1205a9db5d6dda3e1db50bdd221d9bb802089647 /lib/kernel/src/logger.erl | |
parent | 2a527454677dc0216c5d47ad580aad2e913e1b9a (diff) | |
parent | 6d795779f770deb1829e1df2fa4a75f41e602d35 (diff) | |
download | otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.gz otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.tar.bz2 otp-4d72eedc0d3573e9709b8f2c8773429e85529d7f.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src/logger.erl')
-rw-r--r-- | lib/kernel/src/logger.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl index 7d36640f52..38bd2f481c 100644 --- a/lib/kernel/src/logger.erl +++ b/lib/kernel/src/logger.erl @@ -61,6 +61,7 @@ -export([set_process_metadata/1, update_process_metadata/1, unset_process_metadata/0, get_process_metadata/0]). -export([i/0, i/1]). +-export([timestamp/0]). %% Basic report formatting -export([format_report/1, format_otp_report/1]). @@ -154,7 +155,8 @@ filter_return/0, config_handler/0, formatter_config/0, - olp_config/0]). + olp_config/0, + timestamp/0]). %%%----------------------------------------------------------------- %%% API @@ -354,6 +356,10 @@ internal_log(Level,Term) when is_atom(Level) -> erlang:display_string("Logger - "++ atom_to_list(Level) ++ ": "), erlang:display(Term). +-spec timestamp() -> timestamp(). +timestamp() -> + os:system_time(microsecond). + %%%----------------------------------------------------------------- %%% Configuration -spec add_primary_filter(FilterId,Filter) -> ok | {error,term()} when @@ -1129,7 +1135,7 @@ proc_meta() -> default(pid) -> self(); default(gl) -> group_leader(); -default(time) -> erlang:system_time(microsecond). +default(time) -> timestamp(). %% Remove everything upto and including this module from the stacktrace filter_stacktrace(Module,[{Module,_,_,_}|_]) -> |