aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/kernel/doc/src/kernel_app.xml10
-rw-r--r--lib/kernel/doc/src/logger_chapter.xml8
-rw-r--r--lib/kernel/src/kernel.app.src2
-rw-r--r--lib/kernel/src/logger.erl6
-rw-r--r--lib/kernel/test/logger_env_var_SUITE.erl16
-rw-r--r--lib/sasl/doc/src/error_logging.xml4
-rw-r--r--lib/sasl/doc/src/sasl_app.xml6
-rw-r--r--system/doc/system_principles/error_logging.xml4
8 files changed, 28 insertions, 28 deletions
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index a9292e7660..0f7e95472b 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -204,17 +204,17 @@
<note><p>This configuration option only effects the <c>default</c>
and <c>sasl</c> handler. Any other handlers are uneffected.</p></note>
</item>
- <tag><marker id="logger_log_progress"/>
- <c>logger_log_progress = boolean()</c></tag>
+ <tag><marker id="logger_progress_reports"/>
+ <c>logger_progress_reports = stop | log</c></tag>
<item>
<p>If <c>logger_sasl_compatible = false</c>,
- then <c>logger_log_progress</c> specifies if progress
+ then <c>logger_progress_reports</c> specifies if progress
reports from <c>supervisor</c>
and <c>application_controller</c> shall be logged by the
default logger.</p>
<p>If <c>logger_sasl_compatible = true</c>,
- then <c>logger_log_progress</c> is ignored.</p>
- <p>The default value is <c>false</c></p>
+ then <c>logger_progress_reports</c> is ignored.</p>
+ <p>The default value is <c>stop</c></p>
<note><p>This configuration option only effects the <c>default</c>
and <c>sasl</c> handler. Any other handlers are uneffected.</p></note>
</item>
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 78c595d521..dff9ee2892 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -344,8 +344,8 @@
<seealso marker="#logger"><c>logger</c></seealso>,
<seealso marker="kernel_app#logger_level"><c>logger_level</c></seealso>,
<seealso marker="kernel_app#logger_sasl_compatible"><c>logger_sasl_compatible</c></seealso> and
- <seealso marker="kernel_app#logger_log_progress"><c>logger_log_progress</c></seealso>.
- <c>logger_level</c>, <c>logger_sasl_compatible</c> and <c>logger_log_progress</c> are described in the
+ <seealso marker="kernel_app#logger_progress_reports"><c>logger_progress_reports</c></seealso>.
+ <c>logger_level</c>, <c>logger_sasl_compatible</c> and <c>logger_progress_reports</c> are described in the
<seealso marker="kernel_app#configuration">Kernel Configuration</seealso>,
while <c>logger</c> is described below.</p>
@@ -617,8 +617,8 @@
default.</item>
<item>Progress reports are not logged by default, but can be
enabled with the Kernel configuration
- parameter <seealso marker="kernel_app#logger_log_progress">
- <c>logger_log_progress</c></seealso>.</item>
+ parameter <seealso marker="kernel_app#logger_progress_reports">
+ <c>logger_progress_reports</c></seealso>.</item>
<item>The output format is the same for all log
events.</item>
</list>
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 23ac5b3444..46fb3e09d5 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -142,7 +142,7 @@
{applications, []},
{env, [{logger_level, info},
{logger_sasl_compatible, false},
- {logger_log_progress, false}
+ {logger_progress_reports, stop}
]},
{mod, {kernel, []}},
{runtime_dependencies, ["erts-10.0", "stdlib-3.5", "sasl-3.0"]}
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
index f22fd5e8de..b32fca1fda 100644
--- a/lib/kernel/src/logger.erl
+++ b/lib/kernel/src/logger.erl
@@ -731,10 +731,10 @@ get_default_handler_filters() ->
?DEFAULT_HANDLER_FILTERS([beam,erlang,otp]);
false ->
Extra =
- case application:get_env(kernel, logger_log_progress, false) of
- true ->
+ case application:get_env(kernel, logger_progress_reports, stop) of
+ log ->
[];
- false ->
+ stop ->
[{stop_progress,
{fun logger_filters:progress/2,stop}}]
end,
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 6a8a868cc2..a808a31f17 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -149,7 +149,7 @@ error_logger_false_progress(Config) ->
setup(Config,
[{error_logger,false},
{logger_level,notice},
- {logger_log_progress,true}]),
+ {logger_progress_reports,log}]),
false = lists:keymember(?STANDARD_HANDLER,1,Hs),
{logger_simple,logger_simple,SimpleC} = lists:keyfind(logger_simple,1,Hs),
info = maps:get(level,SimpleC),
@@ -255,7 +255,7 @@ logger_file_log_progress(Config) ->
Log = file(Config,?FUNCTION_NAME),
{ok,#{handlers:=Hs},Node}
= setup(Config,
- [{logger_log_progress,true},
+ [{logger_progress_reports,log},
{logger,
[{handler,?STANDARD_HANDLER,logger_std_h,
#{logger_std_h=>#{type=>{file,Log}}}}]}]),
@@ -340,7 +340,7 @@ logger_filters(Config) ->
Log = file(Config,?FUNCTION_NAME),
{ok,#{handlers:=Hs,logger:=Logger},Node}
= setup(Config,
- [{logger_log_progress,true},
+ [{logger_progress_reports,log},
{logger,
[{handler,?STANDARD_HANDLER,logger_std_h,
#{logger_std_h=>#{type=>{file,Log}}}},
@@ -367,7 +367,7 @@ logger_filters_stop(Config) ->
Log = file(Config,?FUNCTION_NAME),
{ok,#{handlers:=Hs,logger:=Logger},Node}
= setup(Config,
- [{logger_log_progress,true},
+ [{logger_progress_reports,log},
{logger,
[{handler,?STANDARD_HANDLER,logger_std_h,
#{filters=>[],
@@ -393,7 +393,7 @@ logger_module_level(Config) ->
Log = file(Config,?FUNCTION_NAME),
{ok,#{handlers:=Hs,module_levels:=ModuleLevels},Node}
= setup(Config,
- [{logger_log_progress,true},
+ [{logger_progress_reports,log},
{logger,
[{handler,?STANDARD_HANDLER,logger_std_h,
#{logger_std_h=>#{type=>{file,Log}}}},
@@ -552,7 +552,7 @@ sasl_compatible_false(Config) ->
{ok,_Hs,Node} = setup(Config,
[{error_logger,{file,Log}},
{logger_sasl_compatible,false},
- {logger_log_progress,true}]),
+ {logger_progress_reports,log}]),
check_default_log(Node,Log,
file,% dest
6),% progress in std logger
@@ -563,7 +563,7 @@ sasl_compatible_false_no_progress(Config) ->
{ok,_Hs,Node} = setup(Config,
[{error_logger,{file,Log}},
{logger_sasl_compatible,false},
- {logger_log_progress,false}]),
+ {logger_progress_reports,stop}]),
check_default_log(Node,Log,
file,% dest
0),% progress in std logger
@@ -589,7 +589,7 @@ bad_sasl_compatibility(Config) ->
error = setup(Config,[{logger_sasl_compatible,badcomp}]).
bad_progress(Config) ->
- error = setup(Config,[{logger_log_progress,badprogress}]).
+ error = setup(Config,[{logger_progress_reports,badprogress}]).
%%%-----------------------------------------------------------------
%%% Internal
diff --git a/lib/sasl/doc/src/error_logging.xml b/lib/sasl/doc/src/error_logging.xml
index 44506ffdad..8731b73599 100644
--- a/lib/sasl/doc/src/error_logging.xml
+++ b/lib/sasl/doc/src/error_logging.xml
@@ -46,8 +46,8 @@
Kernel. <seealso marker="#progress_report">Progress
reports</seealso> are by default not logged, but can be enabled
by setting the Kernel configuration
- parameter <seealso marker="kernel:kernel_app#logger_log_progress">
- <c>logger_log_progress</c></seealso> to <c>true</c>.</p>
+ parameter <seealso marker="kernel:kernel_app#logger_progress_reports">
+ <c>logger_progress_reports</c></seealso> to <c>log</c>.</p>
<p>The old SASL error logging behaviour can be re-enabled by setting the
Kernel configuration
parameter <seealso marker="kernel:kernel_app#logger_sasl_compatible">
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 0a9e6483f0..7f4ceeb354 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -102,10 +102,10 @@
reports</em>, <em>crash reports</em>, and <em>progress
reports</em>. These reports are now also printed by the default
logger handler started by the Kernel application. Progress
- reports are by default stopped by a filter, but can easily be
+ reports are by default stopped by a filter, but can be
added by setting the Kernel configuration
- parameter <seealso marker="kernel:kernel_app#logger_log_progress">
- <c>logger_log_progress=true</c></seealso>.</p>
+ parameter <seealso marker="kernel:kernel_app#logger_progress_reports">
+ <c>logger_progress_reports</c></seealso> to <c>log</c>.</p>
<p>If the old error logger event handlers are still desired, they
must be added by
calling <c>error_logger:add_report_handler/1,2</c>.</p>
diff --git a/system/doc/system_principles/error_logging.xml b/system/doc/system_principles/error_logging.xml
index ee3d68d80e..2e28753c02 100644
--- a/system/doc/system_principles/error_logging.xml
+++ b/system/doc/system_principles/error_logging.xml
@@ -63,7 +63,7 @@ Error in process <0.27.0> with exit value: {{badmatch,[1,2,3]},[{m,f,1},{shell,e
and so on) send progress and error information to
Logger. Progress reports are by default not logged, but can be
enabled by setting the Kernel configuration
- parameter <c>logger_log_progress</c> to true. Supervisor
+ parameter <c>logger_progress_reports</c> to <c>log</c>. Supervisor
reports, crash reports and other error and information reports
are by default logged through the log handler which is
set up when the Kernel application is started.</p>
@@ -76,7 +76,7 @@ Error in process <0.27.0> with exit value: {{badmatch,[1,2,3]},[{m,f,1},{shell,e
<seealso marker="sasl:error_logging">SASL Error Logging</seealso>
in the SASL User's Guide.</p>
<pre>
-% <input>erl -kernel logger_log_progress true</input>
+% <input>erl -kernel logger_progress_reports log</input>
Erlang/OTP 21 [erts-10.0] [source-76388a1] [64-bit] [smp:4:4] [ds:4:4:10] [async-threads:1] [hipe]
=PROGRESS REPORT==== 18-May-2018::21:33:41.705292 ===
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 16:09:16 +0000