diff options
| author | Siri Hansen <[email protected]> | 2018-05-07 12:02:59 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2018-05-07 12:02:59 +0200 |
| commit | cd832e85a3029162c31659ca174efdf43a08c8d2 (patch) | |
| tree | 160726aa478bfce1ab6d221dc0b40e5dcfaa33ce /lib/kernel/src/logger_formatter.erl | |
| parent | 4c350d64b85686b731d0888c36159b4d126e5cf1 (diff) | |
| parent | 3c9e4adff06a3f74513cb6658405e43e674133c1 (diff) | |
| download | otp-cd832e85a3029162c31659ca174efdf43a08c8d2.tar.gz otp-cd832e85a3029162c31659ca174efdf43a08c8d2.tar.bz2 otp-cd832e85a3029162c31659ca174efdf43a08c8d2.zip | |
Merge branch 'siri/logger-fix'
* siri/logger-fix:
Change logger callback removing_handler/1 to removing_handler/2
Don't crash logger_server due to unexpected message
Add logger:update_process_metadata/1
Improve documentation of logger:set_*_config functions
Change return type from logger_formatter:format/2
Improve test of logger_disk_log_h and logger_std_h
Update logger documentation
Set single_line=true by default in logger_formatter
Diffstat (limited to 'lib/kernel/src/logger_formatter.erl')
| -rw-r--r-- | lib/kernel/src/logger_formatter.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/kernel/src/logger_formatter.erl b/lib/kernel/src/logger_formatter.erl index 386e7832e2..8e954f8d98 100644 --- a/lib/kernel/src/logger_formatter.erl +++ b/lib/kernel/src/logger_formatter.erl @@ -29,7 +29,7 @@ %%%----------------------------------------------------------------- %%% API --spec format(Log,Config) -> String when +-spec format(Log,Config) -> unicode:chardata() when Log :: logger:log(), Config :: #{single_line=>boolean(), legacy_header=>boolean(), @@ -38,8 +38,7 @@ max_size=>pos_integer() | unlimited, depth=>pos_integer() | unlimited, template=>template(), - utc=>boolean()}, - String :: string(). + utc=>boolean()}. format(#{level:=Level,msg:=Msg0,meta:=Meta},Config0) when is_map(Config0) -> Config = add_default_config(Config0), @@ -263,7 +262,7 @@ utcstr(_) -> "". add_default_config(#{utc:=_}=Config0) -> Default = #{legacy_header=>false, - single_line=>false, + single_line=>true, chars_limit=>unlimited}, MaxSize = get_max_size(maps:get(max_size,Config0,false)), Depth = get_depth(maps:get(depth,Config0,false)), |