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 /erts/preloaded/src/prim_file.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 'erts/preloaded/src/prim_file.erl')
| -rw-r--r-- | erts/preloaded/src/prim_file.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index 0994e2a9f4..1aa5d85c64 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -572,12 +572,13 @@ list_dir_convert([RawName | Rest], SkipInvalid, Result) -> {error, ignore} -> list_dir_convert(Rest, SkipInvalid, Result); {error, warning} -> - %% this is equal to calling error_logger:warning_msg/2 which - %% we don't want to do from code_server during system boot + %% This is equal to calling logger:warning/3 which + %% we don't want to do from code_server during system boot. + %% We don't want to call logger:timestamp() either. logger ! {log,warning,"Non-unicode filename ~p ignored\n", [RawName], #{pid=>self(), gl=>group_leader(), - time=>erlang:system_time(microsecond), + time=>os:system_time(microsecond), error_logger=>#{tag=>warning_msg}}}, list_dir_convert(Rest, SkipInvalid, Result); {error, _} -> |