yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/src/config/emqx_config_logger.erl
View File

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

4
apps/emqx_conf/src/emqx_conf_schema.erl
View File

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

4
apps/emqx_conf/test/emqx_conf_logger_SUITE.erl
View File

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

8
apps/emqx_conf/test/emqx_conf_schema_tests.erl
View File

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

1
changes/ce/feat-11062.en.md Normal file
View File

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