feat: rename log.file.to to log.file.path

This commit is contained in:
zhongwencool 2023-06-15 17:53:27 +08:00
parent 1a5684e35e
commit e6c2da8d19
5 changed files with 10 additions and 9 deletions

View File

@ -151,7 +151,7 @@ tr_file_handler({HandlerName, SubConf}) ->
level => conf_get("level", SubConf),
config => (log_handler_conf(SubConf))#{
type => wrap,
file => conf_get("to", SubConf),
file => conf_get("path", SubConf),
max_no_files => conf_get("rotation_count", SubConf),
max_no_bytes => conf_get("rotation_size", SubConf)
},

View File

@ -909,13 +909,13 @@ fields("console_handler") ->
log_handler_common_confs(console);
fields("log_file_handler") ->
[
{"to",
{"path",
sc(
file(),
#{
desc => ?DESC("log_file_handler_file"),
default => <<"${EMQX_LOG_DIR}/emqx.log">>,
aliases => [file],
aliases => [file, to],
importance => ?IMPORTANCE_HIGH,
converter => fun(Path, Opts) ->
emqx_schema:naive_env_interpolation(ensure_unicode_path(Path, Opts))

View File

@ -43,7 +43,7 @@
file {
enable = true
level = info
to = \"log/emqx.log\"
path = \"log/emqx.log\"
}
}
""").
@ -67,7 +67,7 @@ t_log_conf(_Conf) ->
<<"rotation_count">> => 10,
<<"rotation_size">> => <<"50MB">>,
<<"time_offset">> => <<"system">>,
<<"to">> => <<"log/emqx.log">>
<<"path">> => <<"log/emqx.log">>
},
ExpectLog1 = #{
<<"console">> =>

View File

@ -206,7 +206,7 @@ log_rotation_count_limit_test() ->
"""
log.file {
enable = true
to = \"log/emqx.log\"
path = \"log/emqx.log\"
formatter = text
level = debug
rotation = {count = ~w}
@ -434,7 +434,7 @@ log_path_test_() ->
#{<<"log">> => #{<<"file_handlers">> => #{<<"name1">> => #{<<"file">> => Path}}}}
end,
Assert = fun(Name, Path, Conf) ->
?assertMatch(#{log := #{file := #{Name := #{to := Path}}}}, Conf)
?assertMatch(#{log := #{file := #{Name := #{path := Path}}}}, Conf)
end,
[
@ -452,7 +452,7 @@ log_path_test_() ->
"handler_name" :=
#{
kind := validation_error,
path := "log.file.name1.to",
path := "log.file.name1.path",
reason := {"bad_file_path_string", _}
}
}
@ -471,7 +471,7 @@ log_path_test_() ->
"handler_name" :=
#{
kind := validation_error,
path := "log.file.name1.to",
path := "log.file.name1.path",
reason := {"not_string", _}
}
}

View File

@ -0,0 +1 @@
Rename `log.file.to` to `log.file.path`.