File 8421-dets-Update-all-error_logger-calls-to-be-logger-call.patch of Package erlang
From 0025252968ee30d81b957dfdb1640845df81c30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Backstr=C3=B6m?= <lukas@erlang.org>
Date: Mon, 17 Feb 2025 08:56:16 +0100
Subject: [PATCH] dets: Update all error_logger calls to be logger calls
---
lib/stdlib/src/dets.erl | 39 +++++++++++++++++------------------
lib/stdlib/src/dets_utils.erl | 8 ++++---
lib/stdlib/src/dets_v9.erl | 5 ++---
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 9bcb0bc6f7..81f5a536be 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -165,7 +165,7 @@ message.
{badarg_exit,2},{lookup_reply,2},
{pidof,1},{resp,2}]}).
--include_lib("kernel/include/file.hrl").
+-include_lib("kernel/include/logger.hrl").
-include("dets.hrl").
@@ -2051,8 +2051,7 @@ open_file_loop2(Head, N) ->
sys:handle_system_msg(Req, From, Head#head.parent,
?MODULE, [], Head);
Message ->
- error_logger:format("** dets: unexpected message"
- "(ignored): ~tw~n", [Message]),
+ ?LOG_ERROR("** dets: unexpected message (ignored): ~tw~n", [Message]),
open_file_loop(Head, N)
end.
@@ -2284,15 +2283,15 @@ bug_found(Name, Op, Bad, Stacktrace, From) ->
true ->
%% If stream_op/5 found more requests, this is not
%% the last operation.
- error_logger:format
- ("** dets: Bug was found when accessing table ~tw,~n"
+ ?LOG_ERROR(
+ "** dets: Bug was found when accessing table ~tw,~n"
"** dets: operation was ~tp and reply was ~tw.~n"
"** dets: Stacktrace: ~tw~n",
[Name, Op, Bad, Stacktrace]);
false ->
- error_logger:format
- ("** dets: Bug was found when accessing table ~tw~n",
- [Name])
+ ?LOG_ERROR(
+ "** dets: Bug was found when accessing table ~tw~n",
+ [Name])
end,
if
From =/= self() ->
@@ -2817,8 +2816,8 @@ do_open_file([Fname, Verbose], Parent, Server, Ref) ->
{'EXIT', _Reason} = Error ->
Error;
Bad ->
- error_logger:format
- ("** dets: Bug was found in open_file/1, reply was ~tw.~n",
+ ?LOG_ERROR(
+ "** dets: Bug was found in open_file/1, reply was ~tw.~n",
[Bad]),
{error, {dets_bug, Fname, Bad}}
end;
@@ -2834,8 +2833,8 @@ do_open_file([Tab, OpenArgs, Verb], Parent, Server, _Ref) ->
{'EXIT', _Reason} = Error ->
Error;
Bad ->
- error_logger:format
- ("** dets: Bug was found in open_file/2, arguments were~n"
+ ?LOG_ERROR(
+ "** dets: Bug was found in open_file/2, arguments were~n"
"** dets: ~tw and reply was ~tw.~n",
[OpenArgs, Bad]),
{error, {dets_bug, Tab, {open_file, OpenArgs}, Bad}}
@@ -3190,7 +3189,7 @@ fopen2(Fname, Tab) ->
end,
case Do of
{repair, Mess} ->
- error_logger:format("dets: file ~tp~s~n", [Fname, Mess]),
+ ?LOG_INFO("dets: file ~tp~s~n", [Fname, Mess]),
case fsck(Fd, Tab, Fname, FH, default, default) of
ok ->
fopen2(Fname, Tab);
@@ -3269,7 +3268,7 @@ fopen_existing_file(Tab, OpenArgs) ->
_ when FH#fileheader.keypos =/= Kp ->
throw({error, {keypos_mismatch, Fname}});
{compact, SourceHead} ->
- error_logger:format("dets: file ~tp is now compacted ...~n", [Fname]),
+ ?LOG_DEBUG("dets: file ~tp is now compacted ...~n", [Fname]),
{ok, NewSourceHead} = open_final(SourceHead, Fname, read, false,
?DEFAULT_CACHE, Tab, Debug),
case catch compact(NewSourceHead) of
@@ -3279,14 +3278,14 @@ fopen_existing_file(Tab, OpenArgs) ->
_Err ->
_ = file:close(Fd),
dets_utils:stop_disk_map(),
- error_logger:format("dets: compaction of file ~tp failed, "
- "now repairing ...~n", [Fname]),
+ ?LOG_INFO("dets: compaction of file ~tp failed, "
+ "now repairing ...~n", [Fname]),
{ok, Fd2, _FH} = read_file_header(Fname, Acc, Ram),
do_repair(Fd2, Tab, Fname, FH, MinSlots, MaxSlots,
OpenArgs)
end;
{repair, Mess} ->
- error_logger:format("dets: file ~tp~s~n", [Fname, Mess]),
+ ?LOG_INFO("dets: file ~tp~s~n", [Fname, Mess]),
do_repair(Fd, Tab, Fname, FH, MinSlots, MaxSlots,
OpenArgs);
{final, H} ->
@@ -3823,8 +3822,8 @@ check_safe_fixtable(Head) ->
case (Head#head.fixed =:= false) andalso
((get(verbose) =:= yes) orelse dets_utils:debug_mode()) of
true ->
- error_logger:format
- ("** dets: traversal of ~tp needs safe_fixtable~n",
+ ?LOG_DEBUG(
+ "** dets: traversal of ~tp needs safe_fixtable~n",
[Head#head.name]);
false ->
ok
@@ -3890,7 +3889,7 @@ scan_read(H, From, _To, Min, _L, Ts, R, C) ->
err(Error) ->
case get(verbose) of
yes ->
- error_logger:format("** dets: failed with ~tw~n", [Error]),
+ ?LOG_INFO("** dets: failed with ~tw~n", [Error]),
Error;
undefined ->
Error
diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl
index 450036c7df..399f9ae3b8 100644
--- a/lib/stdlib/src/dets_utils.erl
+++ b/lib/stdlib/src/dets_utils.erl
@@ -20,6 +20,8 @@
%%
-module(dets_utils).
+-include_lib("kernel/include/logger.hrl").
+
%% Utility functions common to several dets file formats.
%% To be used from modules dets and dets_v9 only.
@@ -391,7 +393,7 @@ corrupt_reason(Head, Reason0) ->
corrupt(Head, Error) ->
case get(verbose) of
yes ->
- error_logger:format("** dets: Corrupt table ~tp: ~tp\n",
+ ?LOG_ERROR("** dets: Corrupt table ~tp: ~tp\n",
[Head#head.name, Error]);
_ -> ok
end,
@@ -404,7 +406,7 @@ corrupt(Head, Error) ->
vformat(F, As) ->
case get(verbose) of
- yes -> error_logger:format(F, As);
+ yes -> ?LOG_DEBUG(F, As);
_ -> ok
end.
@@ -853,7 +855,7 @@ get_disk_map() ->
end.
init_disk_map(Name) ->
- error_logger:info_msg("** dets: (debug) using disk map for ~p~n", [Name]),
+ ?LOG_INFO("** dets: (debug) using disk map for ~p~n", [Name]),
put(?DM, ets:new(any,[ordered_set])).
stop_disk_map() ->
diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl
index 527d14e8d8..1e70147c20 100644
--- a/lib/stdlib/src/dets_v9.erl
+++ b/lib/stdlib/src/dets_v9.erl
@@ -2635,9 +2635,8 @@ v_segment(H, SegNo, SegPos, SegSlot) ->
BucketP = SegPos + (4 * ?SZOBJP * SegSlot),
case catch read_bucket(H, BucketP, H#head.type) of
{'EXIT', Reason} ->
- dets_utils:vformat("** dets: Corrupt or truncated dets file~n",
- []),
- io:format("~nERROR ~tp~n", [Reason]);
+ io:format("** dets: Corrupt or truncated dets file~nERROR ~tp~n",
+ [Reason]);
[] -> %% don't print empty buckets
true;
{Size, CollP, Objects} ->
--
2.43.0
