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

feat: convert rotation from map to integer

This commit is contained in:
Zhongwen Deng 2023-05-05 09:53:54 +08:00
parent 7b000157d0
commit d31a44f96b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -909,6 +909,7 @@ fields("log_file_handler") ->
#{ #{
aliases => [rotation], aliases => [rotation],
default => 10, default => 10,
converter => fun convert_rotation/2,
desc => ?DESC("log_rotation_count"), desc => ?DESC("log_rotation_count"),
importance => ?IMPORTANCE_MEDIUM importance => ?IMPORTANCE_MEDIUM
} }
@ -1345,3 +1346,7 @@ ensure_file_handlers(Conf, _Opts) ->
HandlersWithoutName = maps:with(FileFields, Conf), HandlersWithoutName = maps:with(FileFields, Conf),
HandlersWithName = maps:without(FileFields, Conf), HandlersWithName = maps:without(FileFields, Conf),
emqx_utils_maps:deep_merge(#{<<"default">> => HandlersWithoutName}, HandlersWithName). emqx_utils_maps:deep_merge(#{<<"default">> => HandlersWithoutName}, HandlersWithName).
convert_rotation(undefined, _Opts) -> undefined;
convert_rotation(#{} = Rotation, _Opts) -> maps:get(count, Rotation, 10);
convert_rotation(Count, _Opts) when is_integer(Count) -> Count.