[logger] Change names of sync functions in built-in handlers

logger_std_h:filesync/1           -----> logger_std_h:sync/1
logger_disk_log_h:disk_log_sync/1 -----> logger_disk_log_h:sync/1

6 files changed, 52 insertions, 52 deletions

diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index 773aa75bc6..00643b6a84 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, disk_log_sync/1, reset/1]).
+-export([start_link/3, info/1, sync/1, reset/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -57,18 +57,18 @@ start_link(Name, Config, HandlerState) ->
 
 %%%-----------------------------------------------------------------
 %%%
--spec disk_log_sync(Name) -> ok | {error,Reason} when
+-spec sync(Name) -> ok | {error,Reason} when
       Name :: atom(),
       Reason :: handler_busy | {badarg,term()}.
 
-disk_log_sync(Name) when is_atom(Name) ->
+sync(Name) when is_atom(Name) ->
     try
         gen_server:call(Name, disk_log_sync, ?DEFAULT_CALL_TIMEOUT)
     catch
         _:{timeout,_} -> {error,handler_busy}
     end;
-disk_log_sync(Name) ->
-    {error,{badarg,{disk_log_sync,[Name]}}}.
+sync(Name) ->
+    {error,{badarg,{sync,[Name]}}}.
 
 %%%-----------------------------------------------------------------
 %%%
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
index 63c3ab2dac..323f4f02e7 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, filesync/1, reset/1]).
+-export([start_link/3, info/1, sync/1, reset/1]).
 
 %% gen_server and proc_lib callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -58,18 +58,18 @@ start_link(Name, Config, HandlerState) ->
 
 %%%-----------------------------------------------------------------
 %%%
--spec filesync(Name) -> ok | {error,Reason} when
+-spec sync(Name) -> ok | {error,Reason} when
       Name :: atom(),
       Reason :: handler_busy | {badarg,term()}.
 
-filesync(Name) when is_atom(Name) ->
+sync(Name) when is_atom(Name) ->
     try
         gen_server:call(Name, filesync, ?DEFAULT_CALL_TIMEOUT)
     catch
         _:{timeout,_} -> {error,handler_busy}
     end;
-filesync(Name) ->
-    {error,{badarg,{filesync,[Name]}}}.
+sync(Name) ->
+    {error,{badarg,{sync,[Name]}}}.
 
 %%%-----------------------------------------------------------------
 %%%
@@ -790,7 +790,7 @@ sync_dev(Fd, DevName, PrevSyncResult, HandlerName) ->
             %% don't report same error twice
             PrevSyncResult;
         Error ->
-            logger_h_common:error_notify({HandlerName,filesync,DevName,Error}),
+            logger_h_common:error_notify({HandlerName,sync,DevName,Error}),
             Error
     end.
 
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 7a1736c814..2b5bbe6aed 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -82,7 +82,7 @@ all() ->
      bad_input,
      info_and_reset,
      reconfig,
-     disk_log_sync,
+     sync,
      disk_log_full,
      disk_log_wrap,
      disk_log_events,
@@ -124,7 +124,7 @@ create_log(Config) ->
                                 formatter=>{?MODULE,self()}},
                        #{file=>LogFile1}),
     logger:info("hello", ?domain),
-    logger_disk_log_h:disk_log_sync(Name1),
+    logger_disk_log_h:sync(Name1),
     ct:pal("Checking contents of ~p", [?log_no(LogFile1,1)]),
     try_read_file(?log_no(LogFile1,1), {ok,<<"hello\n">>}, 5000),
     
@@ -137,7 +137,7 @@ create_log(Config) ->
                                 formatter=>{?MODULE,self()}},
                        #{file=>LogFile2}),
     logger:info("dummy", ?domain),
-    logger_disk_log_h:disk_log_sync(Name2),
+    logger_disk_log_h:sync(Name2),
     ct:pal("Checking contents of ~p", [?log_no(LogFile2,1)]),
     try_read_file(?log_no(LogFile2,1), {ok,<<"dummy\n">>}, 5000),
 
@@ -158,7 +158,7 @@ open_existing_log(Config) ->
                                 formatter=>{?MODULE,self()}},
                        #{file=>LogFile1}),
     logger:info("one", ?domain),
-    logger_disk_log_h:disk_log_sync(HName),
+    logger_disk_log_h:sync(HName),
     ct:pal("Checking contents of ~p", [?log_no(LogFile1,1)]),
     try_read_file(?log_no(LogFile1,1), {ok,<<"one\n">>}, 5000),
     logger:info("two", ?domain),
@@ -172,7 +172,7 @@ open_existing_log(Config) ->
                                 formatter=>{?MODULE,self()}},
                        #{file=>LogFile1}),
     logger:info("three", ?domain),
-    logger_disk_log_h:disk_log_sync(HName),
+    logger_disk_log_h:sync(HName),
     try_read_file(?log_no(LogFile1,1), {ok,<<"one\ntwo\nthree\n">>}, 5000),
     remove_and_stop(HName),
     try_read_file(?log_no(LogFile1,1), {ok,<<"one\ntwo\nthree\n">>}, 5000).
@@ -197,22 +197,22 @@ disk_log_opts(Config) ->
     {WFileFull,wrap,{Size,2},1} = {Get(file,WInfo1),Get(type,WInfo1),
                                    Get(size,WInfo1),Get(current_file,WInfo1)},
     logger:info("123", ?domain),
-    logger_disk_log_h:disk_log_sync(WName),
+    logger_disk_log_h:sync(WName),
     timer:sleep(500),
     1 = Get(current_file, disk_log:info(WName)),
 
     logger:info("45", ?domain),
-    logger_disk_log_h:disk_log_sync(WName),
+    logger_disk_log_h:sync(WName),
     timer:sleep(500),
     1 = Get(current_file, disk_log:info(WName)),
 
     logger:info("6", ?domain),
-    logger_disk_log_h:disk_log_sync(WName),
+    logger_disk_log_h:sync(WName),
     timer:sleep(500),
     2 = Get(current_file, disk_log:info(WName)),
 
     logger:info("7890", ?domain),
-    logger_disk_log_h:disk_log_sync(WName),
+    logger_disk_log_h:sync(WName),
     timer:sleep(500),
     2 = Get(current_file, disk_log:info(WName)),
 
@@ -230,7 +230,7 @@ disk_log_opts(Config) ->
     {HFile1Full,halt,infinity} = {Get(file,HInfo1),Get(type,HInfo1),
                                   Get(size,HInfo1)},
     logger:info("12345", ?domain),
-    logger_disk_log_h:disk_log_sync(HName1),
+    logger_disk_log_h:sync(HName1),
     timer:sleep(500),
     1 = Get(no_written_items, disk_log:info(HName1)),
 
@@ -409,8 +409,8 @@ config_fail(cleanup,_Config) ->
     logger:remove_handler(?MODULE).
 
 bad_input(_Config) ->
-    {error,{badarg,{disk_log_sync,["BadType"]}}} =
-        logger_disk_log_h:disk_log_sync("BadType"),
+    {error,{badarg,{sync,["BadType"]}}} =
+        logger_disk_log_h:sync("BadType"),
     {error,{badarg,{info,["BadType"]}}} = logger_disk_log_h:info("BadType"),
     {error,{badarg,{reset,["BadType"]}}} = logger_disk_log_h:reset("BadType").
 
@@ -497,7 +497,7 @@ reconfig(Config) ->
 reconfig(cleanup, _Config) ->
     logger:remove_handler(?MODULE).
 
-disk_log_sync(Config) ->
+sync(Config) ->
     Dir = ?config(priv_dir,Config),
     File = filename:join(Dir, ?FUNCTION_NAME),
     Log = lists:concat([File,".1"]),
@@ -526,8 +526,8 @@ disk_log_sync(Config) ->
     %% an automatic disk log sync
     logger:info("second", ?domain),
     logger:info("third", ?domain),
-    %% do explicit disk_log_sync
-    logger_disk_log_h:disk_log_sync(?MODULE),
+    %% do explicit sync
+    logger_disk_log_h:sync(?MODULE),
     check_tracer(100),
 
     %% check that if there's no repeated disk_log_sync active,
@@ -568,7 +568,7 @@ disk_log_sync(Config) ->
                               #{filesync_repeat_interval => no_repeat}),    
     check_tracer(100),
     ok.
-disk_log_sync(cleanup,_Config) ->
+sync(cleanup,_Config) ->
     dbg:stop_clear(),
     logger:remove_handler(?MODULE).
 
@@ -737,7 +737,7 @@ write_failure(Config) ->
     ct:pal("LogOpts = ~p", [LogOpts = maps:get(log_opts, HState)]),
 
     ok = log_on_remote_node(Node, "Logged1"),
-    rpc:call(Node, logger_disk_log_h, disk_log_sync, [?STANDARD_HANDLER]),
+    rpc:call(Node, logger_disk_log_h, sync, [?STANDARD_HANDLER]),
     ?check_no_log,
     try_read_file(Log, {ok,<<"Logged1\n">>}, ?SYNC_REP_INT),
 
@@ -757,7 +757,7 @@ write_failure(Config) ->
 
     rpc:call(Node, ?MODULE, set_result, [disk_log_blog,ok]),
     ok = log_on_remote_node(Node, "Logged2"),
-    rpc:call(Node, logger_disk_log_h, disk_log_sync, [?STANDARD_HANDLER]),
+    rpc:call(Node, logger_disk_log_h, sync, [?STANDARD_HANDLER]),
     ?check_no_log,
     try_read_file(Log, {ok,<<"Logged1\nLogged2\n">>}, ?SYNC_REP_INT),
     ok.
@@ -1158,7 +1158,7 @@ restart_after(Config) ->
 restart_after(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
-%% send handler requests (filesync, info, reset, change_config)
+%% send handler requests (sync, info, reset, change_config)
 %% during high load to verify that sync, dropping and flushing is
 %% handled correctly.
 handler_requests_under_load() ->
@@ -1171,7 +1171,7 @@ handler_requests_under_load(Config) ->
                                                  flush_reqs_qlen => 2000,
                                                  enable_burst_limit => false}},   
     ok = logger:set_handler_config(?MODULE, NewHConfig),
-    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{disk_log_sync,[]},
+    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{sync,[]},
                                                          {info,[]},
                                                          {reset,[]},
                                                          {change_config,[]}])
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 601d331fb0..be168a264f 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -539,7 +539,7 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
                      file,% dest
                      0,% progress in std logger
                      error), % level
-    ok = rpc:call(Node,logger_std_h,filesync,[info]),
+    ok = rpc:call(Node,logger_std_h,sync,[info]),
     {ok, Bin} = file:read_file(LogInfo),
     ct:log("Log content:~n~s",[Bin]),
     match(Bin,<<"info:">>,NumProgress+1,info,info),
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index 5764abd063..c6391e55fc 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -108,7 +108,7 @@ all() ->
      info_and_reset,
      reconfig,
      file_opts,
-     filesync,
+     sync,
      write_failure,
      sync_failure,
      op_switch_to_sync_file,
@@ -391,7 +391,7 @@ crash_std_h(cleanup) ->
     [test_server:stop_node(Node) || Node <- Nodes].
 
 sync_and_read(Node,disk_log,Log) ->
-    rpc:call(Node,logger_disk_log_h,disk_log_sync,[?STANDARD_HANDLER]),
+    rpc:call(Node,logger_disk_log_h,sync,[?STANDARD_HANDLER]),
     case file:read_file(Log ++ ".1") of
         {ok,<<>>} ->
             timer:sleep(5000),
@@ -400,7 +400,7 @@ sync_and_read(Node,disk_log,Log) ->
             Ok
     end;
 sync_and_read(Node,file,Log) ->
-    rpc:call(Node,logger_std_h,filesync,[?STANDARD_HANDLER]),
+    rpc:call(Node,logger_std_h,sync,[?STANDARD_HANDLER]),
     case file:read_file(Log) of
         {ok,<<>>} ->
             timer:sleep(5000),
@@ -410,7 +410,7 @@ sync_and_read(Node,file,Log) ->
     end.
 
 bad_input(_Config) ->
-    {error,{badarg,{filesync,["BadType"]}}} = logger_std_h:filesync("BadType"),
+    {error,{badarg,{sync,["BadType"]}}} = logger_std_h:sync("BadType"),
     {error,{badarg,{info,["BadType"]}}} = logger_std_h:info("BadType"),
     {error,{badarg,{reset,["BadType"]}}} = logger_std_h:reset("BadType").
 
@@ -503,7 +503,7 @@ file_opts(cleanup, _Config) ->
     logger:remove_handler(?MODULE).
 
 
-filesync(Config) ->
+sync(Config) ->
     Dir = ?config(priv_dir,Config),
     Log = filename:join(Dir, lists:concat([?FUNCTION_NAME,".log"])),
     Type = {file,Log},
@@ -536,10 +536,10 @@ filesync(Config) ->
                   {no_more,500}
                  ]),
     logger:info("second", ?domain),
-    %% do explicit filesync
-    logger_std_h:filesync(?MODULE),
-    %% a second filesync should be ignored
-    logger_std_h:filesync(?MODULE),
+    %% do explicit sync
+    logger_std_h:sync(?MODULE),
+    %% a second sync should be ignored
+    logger_std_h:sync(?MODULE),
     check_tracer(100),
 
     %% check that if there's no repeated filesync active,
@@ -583,7 +583,7 @@ filesync(Config) ->
                               #{filesync_repeat_interval => no_repeat}),
     check_tracer(100),
     ok.
-filesync(cleanup, _Config) ->
+sync(cleanup, _Config) ->
     dbg:stop_clear(),
     logger:remove_handler(?MODULE).
 
@@ -598,7 +598,7 @@ write_failure(Config) ->
     rpc:call(Node, ?MODULE, set_result, [file_write,ok]),
 
     ok = log_on_remote_node(Node, "Logged1"),
-    rpc:call(Node, logger_std_h, filesync, [?STANDARD_HANDLER]),
+    rpc:call(Node, logger_std_h, sync, [?STANDARD_HANDLER]),
     ?check_no_log,
     try_read_file(Log, {ok,<<"Logged1\n">>}, ?FILESYNC_REP_INT),
 
@@ -616,7 +616,7 @@ write_failure(Config) ->
 
     rpc:call(Node, ?MODULE, set_result, [file_write,ok]),
     ok = log_on_remote_node(Node, "Logged2"),
-    rpc:call(Node, logger_std_h, filesync, [?STANDARD_HANDLER]),
+    rpc:call(Node, logger_std_h, sync, [?STANDARD_HANDLER]),
     ?check_no_log,
     try_read_file(Log, {ok,<<"Logged1\nLogged2\n">>}, ?FILESYNC_REP_INT),
     ok.
@@ -647,14 +647,14 @@ sync_failure(Config) ->
     rpc:call(Node, ?MODULE, set_result, [file_datasync,{error,terminated}]),
     ok = log_on_remote_node(Node, "Cause simple error printout"),
     
-    ?check({error,{?STANDARD_HANDLER,filesync,Log,{error,terminated}}}),
+    ?check({error,{?STANDARD_HANDLER,sync,Log,{error,terminated}}}),
 
     ok = log_on_remote_node(Node, "No second error printout"),
     ?check_no_log,
 
     rpc:call(Node, ?MODULE, set_result, [file_datasync,{error,eacces}]),
     ok = log_on_remote_node(Node, "Cause simple error printout"),
-    ?check({error,{?STANDARD_HANDLER,filesync,Log,{error,eacces}}}),
+    ?check({error,{?STANDARD_HANDLER,sync,Log,{error,eacces}}}),
 
     rpc:call(Node, ?MODULE, set_result, [file_datasync,ok]),
     ok = log_on_remote_node(Node, "Logged2"),
@@ -1083,7 +1083,7 @@ restart_after(Config) ->
 restart_after(cleanup, _Config) ->
     ok = stop_handler(?MODULE).
 
-%% send handler requests (filesync, info, reset, change_config)
+%% send handler requests (sync, info, reset, change_config)
 %% during high load to verify that sync, dropping and flushing is
 %% handled correctly.
 handler_requests_under_load() ->
@@ -1097,7 +1097,7 @@ handler_requests_under_load(Config) ->
                                              flush_reqs_qlen => 2000,
                                              enable_burst_limit => false}},   
     ok = logger:set_handler_config(?MODULE, NewHConfig),
-    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{filesync,[]},
+    Pid = spawn_link(fun() -> send_requests(?MODULE, 1, [{sync,[]},
                                                          {info,[]},
                                                          {reset,[]},
                                                          {change_config,[]}])
@@ -1291,8 +1291,8 @@ add_remove_instance_nofile(Type) ->
     group_leader(group_leader(),Pid), % to get printouts in test log
     logger:info(M1=?msg,?domain),
     ?check(M1),
-    %% check that filesync doesn't do damage even if not relevant
-    ok = logger_std_h:filesync(?MODULE),
+    %% check that sync doesn't do damage even if not relevant
+    ok = logger_std_h:sync(?MODULE),
     ok = logger:remove_handler(?MODULE),
     timer:sleep(500),
     undefined = whereis(?MODULE),
diff --git a/lib/kernel/test/logger_test_lib.erl b/lib/kernel/test/logger_test_lib.erl
index 4ac05e6480..5ad6336925 100644
--- a/lib/kernel/test/logger_test_lib.erl
+++ b/lib/kernel/test/logger_test_lib.erl
@@ -52,10 +52,10 @@ log(Node, M, F, A) ->
     rpc:call(Node, M, F, A ++ [MD]).
 
 sync_and_read(Node,disk_log,Log) ->
-    rpc:call(Node,logger_disk_log_h,disk_log_sync,[?STANDARD_HANDLER]),
+    rpc:call(Node,logger_disk_log_h,sync,[?STANDARD_HANDLER]),
     file:read_file(Log ++ ".1");
 sync_and_read(Node, file,Log) ->
-    ok = rpc:call(Node,logger_std_h,filesync,[?STANDARD_HANDLER]),
+    ok = rpc:call(Node,logger_std_h,sync,[?STANDARD_HANDLER]),
     file:read_file(Log).