Merge branch 'peppe/kernel/logger_updates'

* peppe/kernel/logger_updates:
  [logger] Correct documentation
  [logger] Update handler documentation
  [logger] Fix test suite compilation warnings
  [logger] Fix failing tests
  [logger] Change overload_kill_restart_after value to infinity
  [logger] Change name of function sync/1 to filesync/1
  [logger] Reset logger config after tests
  [logger] Don't delete log file of failing test cases
  [logger] Set up priority for processes generatig test bursts
  [logger] Stress overload_kill tests a bit more
  [logger] Remove some compiler warnings in test suites
  [logger] Sort keys when testing formatter template
  [logger] Skip test involving file access rights on windows
  [logger] Skip some overload protection tests when using dirty schedulers

4 files changed, 16 insertions, 16 deletions

diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index a074d0210e..f08621c9c5 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -26,7 +26,7 @@
 -include("logger_h_common.hrl").
 
 %%% API
--export([start_link/3, info/1, sync/1, reset/1]).
+-export([start_link/3, info/1, filesync/1, reset/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -58,19 +58,19 @@ start_link(Name, Config, HandlerState) ->
 
 %%%-----------------------------------------------------------------
 %%%
--spec sync(Name) -> ok | {error,Reason} when
+-spec filesync(Name) -> ok | {error,Reason} when
       Name :: atom(),
       Reason :: handler_busy | {badarg,term()}.
 
-sync(Name) when is_atom(Name) ->
+filesync(Name) when is_atom(Name) ->
     try
         gen_server:call(?name_to_reg_name(?MODULE,Name),
                         disk_log_sync, ?DEFAULT_CALL_TIMEOUT)
     catch
         _:{timeout,_} -> {error,handler_busy}
     end;
-sync(Name) ->
-    {error,{badarg,{sync,[Name]}}}.
+filesync(Name) ->
+    {error,{badarg,{filesync,[Name]}}}.
 
 %%%-----------------------------------------------------------------
 %%%
@@ -704,7 +704,7 @@ disk_log_sync(Name, State) ->
                         ok;
                     _ ->
                         LogOpts = maps:get(log_opts, State),
-                        logger_h_common:error_notify({Name,sync,
+                        logger_h_common:error_notify({Name,filesync,
                                                       LogOpts,
                                                       SyncError})
                 end,
diff --git a/lib/kernel/src/logger_h_common.erl b/lib/kernel/src/logger_h_common.erl
index d556938f02..f9f762405c 100644
--- a/lib/kernel/src/logger_h_common.erl
+++ b/lib/kernel/src/logger_h_common.erl
@@ -115,7 +115,7 @@ check_common_config({overload_kill_qlen,N}) when is_integer(N) ->
 check_common_config({overload_kill_mem_size,N}) when is_integer(N) ->
     valid;
 check_common_config({overload_kill_restart_after,NorA})  when is_integer(NorA);
-                                                              NorA == never ->
+                                                              NorA == infinity ->
     valid;
 
 check_common_config({filesync_repeat_interval,NorA}) when is_integer(NorA);
@@ -261,7 +261,7 @@ flush_log_events(Limit, Limit) ->
     Limit;
 flush_log_events(N, Limit) ->
     %% flush log events but leave other events, such as
-    %% file/disk_log_sync, info and change_config, so that these
+    %% filesync, info and change_config, so that these
     %% have a chance to be processed even under heavy load
     receive
         {'$gen_cast',{log,_}} ->
diff --git a/lib/kernel/src/logger_h_common.hrl b/lib/kernel/src/logger_h_common.hrl
index ad80b51109..e0a7b6e3ca 100644
--- a/lib/kernel/src/logger_h_common.hrl
+++ b/lib/kernel/src/logger_h_common.hrl
@@ -41,10 +41,10 @@
 -define(OVERLOAD_KILL_MEM_SIZE, 3000000).
 
 %% This is the default time that the handler will wait before
-%% restarting and accepting new requests. The value 'never'
+%% restarting and accepting new requests. The value 'infinity'
 %% disables restarts.
 -define(OVERLOAD_KILL_RESTART_AFTER, 5000).
-%%-define(OVERLOAD_KILL_RESTART_AFTER, never).
+%%-define(OVERLOAD_KILL_RESTART_AFTER, infinity).
 
 %% The handler sends asynchronous write requests to the process
 %% controlling the i/o device, but every once in this interval
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
index ce9daa50ab..a03e1ffc2a 100644
--- a/lib/kernel/src/logger_std_h.erl
+++ b/lib/kernel/src/logger_std_h.erl
@@ -28,7 +28,7 @@
 -include_lib("kernel/include/file.hrl").
 
 %% API
--export([start_link/3, info/1, sync/1, reset/1]).
+-export([start_link/3, info/1, filesync/1, reset/1]).
 
 %% gen_server and proc_lib callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -60,19 +60,19 @@ start_link(Name, Config, HandlerState) ->
 
 %%%-----------------------------------------------------------------
 %%%
--spec sync(Name) -> ok | {error,Reason} when
+-spec filesync(Name) -> ok | {error,Reason} when
       Name :: atom(),
       Reason :: handler_busy | {badarg,term()}.
 
-sync(Name) when is_atom(Name) ->
+filesync(Name) when is_atom(Name) ->
     try
         gen_server:call(?name_to_reg_name(?MODULE,Name),
                         filesync, ?DEFAULT_CALL_TIMEOUT)
     catch
         _:{timeout,_} -> {error,handler_busy}
     end;
-sync(Name) ->
-    {error,{badarg,{sync,[Name]}}}.
+filesync(Name) ->
+    {error,{badarg,{filesync,[Name]}}}.
 
 %%%-----------------------------------------------------------------
 %%%
@@ -816,7 +816,7 @@ sync_dev(Fd, DevName, PrevSyncResult, HandlerName) ->
             %% don't report same error twice
             PrevSyncResult;
         Error ->
-            logger_h_common:error_notify({HandlerName,sync,DevName,Error}),
+            logger_h_common:error_notify({HandlerName,filesync,DevName,Error}),
             Error
     end.