Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: use string type for server and servers #9614

Merged
merged 4 commits into from
Dec 30, 2022
Merged

refactor: use string type for server and servers #9614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cac7e0c
refactor: move version prefix string detection to a static fun
zmstone Dec 27, 2022
0ce1ca8
refactor: use string type for server and servers
zmstone Dec 24, 2022
981f75d
test(emqx_modules): do not expect badmatch in test cases!!!
zmstone Dec 29, 2022
b30f2ea
fix(statsd schema): a field is not 'required' when it has 'default'
zmstone Dec 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 25 additions & 0 deletions apps/emqx/src/emqx_config.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,31 @@ check_config(SchemaMod, RawConf) ->
check_config(SchemaMod, RawConf, #{}).

check_config(SchemaMod, RawConf, Opts0) ->
try
do_check_config(SchemaMod, RawConf, Opts0)
catch
throw:{Schema, Errors} ->
compact_errors(Schema, Errors)
end.

%% HOCON tries to be very informative about all the detailed errors
%% it's maybe too much when reporting to the user
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be interesting to have a way to disable this compaction when more info is needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah.
don't feel like it's a high prio at the moment.

-spec compact_errors(any(), any()) -> no_return().
compact_errors(Schema, [Error0 | More]) when is_map(Error0) ->
Error1 = Error0#{discarded_errors_count => length(More)},
Error =
case is_atom(Schema) of
true ->
Error1#{schema_module => Schema};
false ->
Error1
end,
throw(Error);
zmstone marked this conversation as resolved.
Show resolved Hide resolved
compact_errors(Schema, Errors) ->
%% unexpected, we need the stacktrace reported, hence error
error({Schema, Errors}).

do_check_config(SchemaMod, RawConf, Opts0) ->
Opts1 = #{
return_plain => true,
format => map,
Expand Down
7 changes: 4 additions & 3 deletions apps/emqx/src/emqx_config_handler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ process_update_request(ConfKeyPath, Handlers, {{update, UpdateReq}, Opts}) ->
BinKeyPath = bin_path(ConfKeyPath),
case check_permissions(update, BinKeyPath, NewRawConf, Opts) of
allow ->
OverrideConf = update_override_config(NewRawConf, Opts),
OverrideConf = merge_to_override_config(NewRawConf, Opts),
{ok, NewRawConf, OverrideConf, Opts};
{deny, Reason} ->
{error, {permission_denied, Reason}}
Expand Down Expand Up @@ -447,9 +447,10 @@ remove_from_override_config(BinKeyPath, Opts) ->
OldConf = emqx_config:read_override_conf(Opts),
emqx_map_lib:deep_remove(BinKeyPath, OldConf).

update_override_config(_RawConf, #{persistent := false}) ->
%% apply new config on top of override config
merge_to_override_config(_RawConf, #{persistent := false}) ->
undefined;
update_override_config(RawConf, Opts) ->
merge_to_override_config(RawConf, Opts) ->
OldConf = emqx_config:read_override_conf(Opts),
maps:merge(OldConf, RawConf).

Expand Down
5 changes: 3 additions & 2 deletions apps/emqx/src/emqx_release.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

-export([
edition/0,
edition_vsn_prefix/0,
edition_longstr/0,
description/0,
version/0
Expand Down Expand Up @@ -45,11 +46,11 @@ description() ->
-spec edition() -> ce | ee.
-ifdef(EMQX_RELEASE_EDITION).
edition() -> ?EMQX_RELEASE_EDITION.

edition_vsn_prefix() -> "e".
edition_longstr() -> <<"Enterprise">>.
-else.
edition() -> ce.

edition_vsn_prefix() -> "v".
edition_longstr() -> <<"Opensource">>.
-endif.

Expand Down